Mercurial > hg > graal-jvmci-8

changeset 22461:07d9f0909560

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename callInitializer to callStatic
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Mon, 24 Aug 2015 19:14:50 -0700
parents f27c163d7dc2
children 7a7dd51e7e0b
files src/share/vm/jvmci/jvmciRuntime.cpp src/share/vm/jvmci/jvmciRuntime.hpp
diffstat 2 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Mon Aug 24 22:35:47 2015 +0200
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Mon Aug 24 19:14:50 2015 -0700
@@ -646,7 +646,7 @@
   return JNIHandles::make_local(THREAD, JVMCIRuntime::get_service_impls(serviceKlass, THREAD)());
 JVM_END
 
-Handle JVMCIRuntime::callInitializer(const char* className, const char* methodName, const char* signature, JavaCallArguments* args) {
+Handle JVMCIRuntime::callStatic(const char* className, const char* methodName, const char* signature, JavaCallArguments* args) {
   guarantee(!_HotSpotJVMCIRuntime_initialized, "cannot reinitialize HotSpotJVMCIRuntime");
   Thread* THREAD = Thread::current();
 
@@ -678,22 +678,23 @@
       JavaCallArguments args;
       oop options = java_lang_String::create_oop_from_str(_options, CHECK_ABORT);
       args.push_oop(options);
-      callInitializer("jdk/internal/jvmci/options/OptionsParser",
-                      "parseOptionsFromVM",
-                      "(Ljava/lang/String;)Ljava/lang/Boolean;", &args);
+      callStatic("jdk/internal/jvmci/options/OptionsParser",
+                 "parseOptionsFromVM",
+                 "(Ljava/lang/String;)Ljava/lang/Boolean;", &args);
     }
 
     if (_compiler != NULL) {
       JavaCallArguments args;
       oop compiler = java_lang_String::create_oop_from_str(_compiler, CHECK_ABORT);
       args.push_oop(compiler);
-      callInitializer("jdk/internal/jvmci/hotspot/HotSpotJVMCICompilerConfig",
-                      "selectCompiler",
-                      "(Ljava/lang/String;)Ljava/lang/Boolean;", &args);
+      callStatic("jdk/internal/jvmci/hotspot/HotSpotJVMCICompilerConfig",
+                 "selectCompiler",
+                 "(Ljava/lang/String;)Ljava/lang/Boolean;", &args);
     }
 
-    Handle result = callInitializer("jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime", "runtime",
-                                    "()Ljdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime;");
+    Handle result = callStatic("jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime",
+                               "runtime",
+                               "()Ljdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime;");
     _HotSpotJVMCIRuntime_initialized = true;
     _HotSpotJVMCIRuntime_instance = JNIHandles::make_global(result());
   }
@@ -701,7 +702,9 @@
 
 void JVMCIRuntime::initialize_JVMCI() {
   if (JNIHandles::resolve(_HotSpotJVMCIRuntime_instance) == NULL) {
-    callInitializer("jdk/internal/jvmci/runtime/JVMCI",     "getRuntime",      "()Ljdk/internal/jvmci/runtime/JVMCIRuntime;");
+    callStatic("jdk/internal/jvmci/runtime/JVMCI",
+               "getRuntime",
+               "()Ljdk/internal/jvmci/runtime/JVMCIRuntime;");
   }
   assert(_HotSpotJVMCIRuntime_initialized == true, "what?");
 }
--- a/src/share/vm/jvmci/jvmciRuntime.hpp	Mon Aug 24 22:35:47 2015 +0200
+++ b/src/share/vm/jvmci/jvmciRuntime.hpp	Mon Aug 24 19:14:50 2015 -0700
@@ -112,7 +112,7 @@
     return _HotSpotJVMCIRuntime_instance;
   }
 
-  static Handle callInitializer(const char* className, const char* methodName, const char* returnType, JavaCallArguments* args = NULL);
+  static Handle callStatic(const char* className, const char* methodName, const char* returnType, JavaCallArguments* args = NULL);
 
   /**
    * Trigger initialization of HotSpotJVMCIRuntime through JVMCI.getRuntime()