Mercurial > hg > openjdk > jdk9 > hotspot
changeset 12522:522c8ddbaa67
8170959: unloading archived shared class caused crash
Reviewed-by: coleenp, sspitsyn, mockner
author | iklam |
---|---|
date | Sun, 08 Jan 2017 10:39:42 -0800 |
parents | 9ce93a5a916e |
children | 019ee3b02acc |
files | src/share/vm/oops/instanceKlass.cpp |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.cpp Fri Jan 06 10:55:30 2017 +0100 +++ b/src/share/vm/oops/instanceKlass.cpp Sun Jan 08 10:39:42 2017 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2139,8 +2139,6 @@ } void InstanceKlass::release_C_heap_structures() { - assert(!this->is_shared(), "should not be called for a shared class"); - // Can't release the constant pool here because the constant pool can be // deallocated separately from the InstanceKlass for default methods and // redefine classes. @@ -2191,7 +2189,7 @@ } // deallocate the cached class file - if (_cached_class_file != NULL) { + if (_cached_class_file != NULL && !MetaspaceShared::is_in_shared_space(_cached_class_file)) { os::free(_cached_class_file); _cached_class_file = NULL; }