comparison src/share/vm/jvmci/jvmciRuntime.cpp @ 22515:feb4131657bb

JVMCIRuntime::metadata_do shouldn't run until HotSpotJVMCIRuntime is initialized
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 03 Sep 2015 13:50:06 -0700
parents df5a7841f92a
children 0915f5bfdfaa
comparison
equal deleted inserted replaced
22514:8e4949926ae5 22515:feb4131657bb
720 } 720 }
721 assert(_HotSpotJVMCIRuntime_initialized == true, "what?"); 721 assert(_HotSpotJVMCIRuntime_initialized == true, "what?");
722 } 722 }
723 723
724 void JVMCIRuntime::metadata_do(void f(Metadata*)) { 724 void JVMCIRuntime::metadata_do(void f(Metadata*)) {
725 if (HotSpotJVMCIMetaAccessContext::klass() == NULL) { 725 if (!is_HotSpotJVMCIRuntime_initialized()) {
726 assert(HotSpotJVMCIMetaAccessContext::klass() == NULL ||
727 !HotSpotJVMCIMetaAccessContext::klass()->is_linked() ||
728 HotSpotJVMCIMetaAccessContext::allContexts() == NULL, "shouldn't be anything registered yet");
726 return; 729 return;
727 } 730 }
731
728 // WeakReference<HotSpotJVMCIMetaAccessContext>[] 732 // WeakReference<HotSpotJVMCIMetaAccessContext>[]
729 objArrayOop allContexts = HotSpotJVMCIMetaAccessContext::allContexts(); 733 objArrayOop allContexts = HotSpotJVMCIMetaAccessContext::allContexts();
730 if (allContexts == NULL) { 734 if (allContexts == NULL) {
731 return; 735 return;
732 } 736 }