Mercurial > hg > truffle

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.cpp	Thu Jul 03 14:31:34 2014 +0200
+++ b/src/share/vm/oops/instanceKlass.cpp	Thu Jul 03 16:30:28 2014 +0200
@@ -1207,7 +1207,7 @@
   }
 
 #ifdef GRAAL
-  if (this_oop->is_subtype_of(SystemDictionary::Node_klass())) {
+  if (SystemDictionary::Node_klass() != NULL && this_oop->is_subtype_of(SystemDictionary::Node_klass())) {
     if (this_oop() != SystemDictionary::Node_klass()) {
       if (!GraalRuntime::is_HotSpotGraalRuntime_initialized() && JavaAssertions::systemClassDefault() == false) {
         // We want to ensure that the process of initializing HotSpotGraalRuntime