Mercurial > hg > truffle
diff src/share/vm/classfile/classFileParser.cpp @ 7187:5fafdef522c6
Merge
author | johnc |
---|---|
date | Fri, 30 Nov 2012 12:01:34 -0800 |
parents | b2dbd323c668 90273fc0a981 |
children | 35431a769282 |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Thu Nov 29 13:55:49 2012 -0800 +++ b/src/share/vm/classfile/classFileParser.cpp Fri Nov 30 12:01:34 2012 -0800 @@ -2949,7 +2949,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, - Handle class_loader, + ClassLoaderData* loader_data, Handle protection_domain, KlassHandle host_klass, GrowableArray<Handle>* cp_patches, @@ -2963,7 +2963,7 @@ // original class bytes. unsigned char *cached_class_file_bytes = NULL; jint cached_class_file_length; - ClassLoaderData* loader_data = ClassLoaderData::class_loader_data(class_loader()); + Handle class_loader(THREAD, loader_data->class_loader()); bool has_default_methods = false; ResourceMark rm(THREAD); @@ -3004,7 +3004,7 @@ unsigned char* ptr = cfs->buffer(); unsigned char* end_ptr = cfs->buffer() + cfs->length(); - JvmtiExport::post_class_file_load_hook(name, class_loader, protection_domain, + JvmtiExport::post_class_file_load_hook(name, class_loader(), protection_domain, &ptr, &end_ptr, &cached_class_file_bytes, &cached_class_file_length); @@ -4003,8 +4003,7 @@ assert(k->size_helper() > 0, "layout_helper is initialized"); if ((!RegisterFinalizersAtInit && k->has_finalizer()) || k->is_abstract() || k->is_interface() - || (k->name() == vmSymbols::java_lang_Class() - && k->class_loader_data()->is_the_null_class_loader_data()) + || (k->name() == vmSymbols::java_lang_Class() && k->class_loader() == NULL) || k->size_helper() >= FastAllocateSizeLimit) { // Forbid fast-path allocation. jint lh = Klass::instance_layout_helper(k->size_helper(), true);