Mercurial > hg > truffle
diff src/share/vm/classfile/systemDictionary.cpp @ 2273:2ab52cda08e5
Merge with OpenJDK.
author | Thomas Wuerthinger <thomas.wuerthinger@gmail.com> |
---|---|
date | Thu, 03 Mar 2011 19:25:53 +0100 |
parents | d25d4ca69222 4f26f535a225 |
children | 0654ee04b214 |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp Thu Feb 24 13:41:58 2011 +0100 +++ b/src/share/vm/classfile/systemDictionary.cpp Thu Mar 03 19:25:53 2011 +0100 @@ -1691,6 +1691,8 @@ void SystemDictionary::add_to_hierarchy(instanceKlassHandle k, TRAPS) { assert(k.not_null(), "just checking"); + assert_locked_or_safepoint(Compile_lock); + // Link into hierachy. Make sure the vtables are initialized before linking into k->append_to_sibling_list(); // add to superklass/sibling list k->process_interfaces(THREAD); // handle all "implements" declarations @@ -2153,6 +2155,9 @@ } +// Try to find a class name using the loader constraints. The +// loader constraints might know about a class that isn't fully loaded +// yet and these will be ignored. klassOop SystemDictionary::find_constrained_instance_or_array_klass( Symbol* class_name, Handle class_loader, TRAPS) {