Mercurial > hg > graal-compiler

diff src/share/vm/prims/jvm.cpp @ 21559:be896a1983c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 15:36:48 +0200
parents 7848fc12602b
children c28cb37b2e1d
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.cpp	Wed May 27 13:43:27 2015 +0200
+++ b/src/share/vm/prims/jvm.cpp	Thu May 28 15:36:48 2015 +0200
@@ -383,8 +383,8 @@
     const char* compiler_name = "HotSpot " CSIZE "Client Compiler";
 #elif defined(COMPILER2)
     const char* compiler_name = "HotSpot " CSIZE "Server Compiler";
-#elif defined(GRAAL)
-    const char* compiler_name = "HotSpot " CSIZE "Graal Compiler";
+#elif defined(JVMCI)
+    const char* compiler_name = "HotSpot " CSIZE "JVMCI Compiler";
 #else
     const char* compiler_name = "";
 #endif // compilers
@@ -2362,7 +2362,7 @@
 
   ResourceMark rm(THREAD);
   const char* name = k->name()->as_C_string();
-  bool system_class = k->class_loader() == NULL GRAAL_ONLY(|| SystemDictionary::graal_loader() == k->class_loader());
+  bool system_class = k->class_loader() == NULL JVMCI_ONLY(|| SystemDictionary::jvmci_loader() == k->class_loader());
   return JavaAssertions::enabled(name, system_class);
 
 JVM_END