comparison src/share/vm/oops/instanceKlass.cpp @ 16395:ad431bf0de07

added support to load classes from graal.jar with a separate class loader
author Doug Simon <doug.simon@oracle.com>
date Thu, 03 Jul 2014 16:30:28 +0200
parents 66a9286203a2
children 89152779163c
comparison
equal deleted inserted replaced
16394:0dd27c6472d7 16395:ad431bf0de07
1205 JavaValue result(T_VOID); 1205 JavaValue result(T_VOID);
1206 JavaCalls::call(&result, h_method, &args, CHECK); // Static call (no args) 1206 JavaCalls::call(&result, h_method, &args, CHECK); // Static call (no args)
1207 } 1207 }
1208 1208
1209 #ifdef GRAAL 1209 #ifdef GRAAL
1210 if (this_oop->is_subtype_of(SystemDictionary::Node_klass())) { 1210 if (SystemDictionary::Node_klass() != NULL && this_oop->is_subtype_of(SystemDictionary::Node_klass())) {
1211 if (this_oop() != SystemDictionary::Node_klass()) { 1211 if (this_oop() != SystemDictionary::Node_klass()) {
1212 if (!GraalRuntime::is_HotSpotGraalRuntime_initialized() && JavaAssertions::systemClassDefault() == false) { 1212 if (!GraalRuntime::is_HotSpotGraalRuntime_initialized() && JavaAssertions::systemClassDefault() == false) {
1213 // We want to ensure that the process of initializing HotSpotGraalRuntime 1213 // We want to ensure that the process of initializing HotSpotGraalRuntime
1214 // is fast since it executes at VM startup. We must avoid triggering 1214 // is fast since it executes at VM startup. We must avoid triggering
1215 // class initialization of any Node classes during this process. 1215 // class initialization of any Node classes during this process.