Mercurial > hg > graal-jvmci-8

diff src/share/vm/jvmci/jvmciRuntime.cpp @ 23692:93be30973b26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't crash if Services is used but -XX:-EnableJVMCI - just return null
author Doug Simon <doug.simon@oracle.com>
date Thu, 16 Jun 2016 18:23:03 +0200
parents eb166b568645
children 1b939a613788
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Thu Jun 16 11:25:15 2016 +0200
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Thu Jun 16 18:23:03 2016 +0200
@@ -623,6 +623,9 @@
 // private static ClassLoader Services.getJVMCIClassLoader()
 JVM_ENTRY(jobject, JVM_GetJVMCIClassLoader(JNIEnv *env, jclass c))
   if (!EnableJVMCI) {
+    // This message must not change - it is used by the Java code to
+    // distinguish an InternalError due to -EnableJVMCI from other
+    // InternalErrors that may be raised below.
     THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "JVMCI is not enabled")
   }
   JVMCIRuntime::ensure_jvmci_class_loader_is_initialized();