# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1450205755 28800
# Node ID c5dfcc7bdfaf523a10c7c1283a256e74698df68e
# Parent  1dc87d090f967c21042d01659f8c51a052597a9c
Make JVMCIJavaClasses look a little more like JDK9 version

diff -r 1dc87d090f96 -r c5dfcc7bdfaf src/share/vm/jvmci/jvmciCompiler.cpp
--- a/src/share/vm/jvmci/jvmciCompiler.cpp	Tue Dec 15 09:46:00 2015 -0800
+++ b/src/share/vm/jvmci/jvmciCompiler.cpp	Tue Dec 15 10:55:55 2015 -0800
@@ -127,7 +127,7 @@
   }
 
   JVMCIRuntime::ensure_jvmci_class_loader_is_initialized();
-  jvmci_compute_offsets(THREAD);
+  JVMCIJavaClasses::compute_offsets(THREAD);
   HandleMark hm;
   ResourceMark rm;
   Handle receiver = JVMCIRuntime::get_HotSpotJVMCIRuntime(CHECK_ABORT);
diff -r 1dc87d090f96 -r c5dfcc7bdfaf src/share/vm/jvmci/jvmciJavaClasses.cpp
--- a/src/share/vm/jvmci/jvmciJavaClasses.cpp	Tue Dec 15 09:46:00 2015 -0800
+++ b/src/share/vm/jvmci/jvmciJavaClasses.cpp	Tue Dec 15 10:55:55 2015 -0800
@@ -74,7 +74,7 @@
 #define STATIC_BOOLEAN_FIELD(klass, name) FIELD(klass, name, "Z", true)
 
 
-void jvmci_compute_offsets(TRAPS) {
+void JVMCIJavaClasses::compute_offsets(TRAPS) {
   COMPILER_CLASSES_DO(START_CLASS, END_CLASS, CHAR_FIELD, INT_FIELD, BOOLEAN_FIELD, LONG_FIELD, FLOAT_FIELD, OOP_FIELD, OOP_FIELD, OOP_FIELD, STATIC_OOP_FIELD, STATIC_OOP_FIELD, STATIC_INT_FIELD, STATIC_BOOLEAN_FIELD)
 }
 
diff -r 1dc87d090f96 -r c5dfcc7bdfaf src/share/vm/jvmci/jvmciJavaClasses.hpp
--- a/src/share/vm/jvmci/jvmciJavaClasses.hpp	Tue Dec 15 09:46:00 2015 -0800
+++ b/src/share/vm/jvmci/jvmciJavaClasses.hpp	Tue Dec 15 10:55:55 2015 -0800
@@ -24,11 +24,14 @@
 #ifndef SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
 #define SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
 
-void jvmci_compute_offsets(TRAPS);
-
 #include "classfile/systemDictionary.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 
+class JVMCIJavaClasses : AllStatic {
+ public:
+  static void compute_offsets(TRAPS);
+};
+
 /* This macro defines the structure of the CompilationResult - classes.
  * It will generate classes with accessors similar to javaClasses.hpp, but with specializations for oops, Handles and jni handles.
  *
diff -r 1dc87d090f96 -r c5dfcc7bdfaf src/share/vm/jvmci/jvmciRuntime.cpp
--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Tue Dec 15 09:46:00 2015 -0800
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Tue Dec 15 10:55:55 2015 -0800
@@ -802,7 +802,7 @@
 
   JVMCIRuntime::ensure_jvmci_class_loader_is_initialized();
 
-  jvmci_compute_offsets(thread);
+  JVMCIJavaClasses::compute_offsets(thread);
 
   {
     ThreadToNativeFromVM trans(thread);
@@ -945,7 +945,7 @@
       const char* name = p->key() + OPTION_PREFIX_LEN;
       if (strcmp(name, "PrintFlags") == 0 || strcmp(name, "ShowFlags") == 0) {
         JVMCIRuntime::ensure_jvmci_class_loader_is_initialized();
-        jvmci_compute_offsets(THREAD);
+        JVMCIJavaClasses::compute_offsets(THREAD);
         HandleMark hm;
         ResourceMark rm;
         JVMCIRuntime::get_HotSpotJVMCIRuntime(CHECK);