Mercurial > hg > graal-compiler
diff src/share/vm/classfile/systemDictionary.hpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 14 Dec 2012 14:35:13 +0100 |
| parents | 9ba90252ce08 90273fc0a981 |
| children | 989155e2d07a |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.hpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/share/vm/classfile/systemDictionary.hpp Fri Dec 14 14:35:13 2012 +0100 @@ -511,7 +511,7 @@ static void compute_java_system_loader(TRAPS); // Register a new class loader - static ClassLoaderData* register_loader(Handle class_loader); + static ClassLoaderData* register_loader(Handle class_loader, TRAPS); private: // Mirrors for primitive classes (created eagerly) static oop check_mirror(oop m) { @@ -571,7 +571,7 @@ InstanceKlass::cast((loader)->klass())->name()->as_C_string() ); } static const char* loader_name(ClassLoaderData* loader_data) { - return (loader_data->is_the_null_class_loader_data() ? "<bootloader>" : + return (loader_data->class_loader() == NULL ? "<bootloader>" : InstanceKlass::cast((loader_data->class_loader())->klass())->name()->as_C_string() ); }