Mercurial > hg > graal-jvmci-8
changeset 22752:c5dfcc7bdfaf
Make JVMCIJavaClasses look a little more like JDK9 version
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Tue, 15 Dec 2015 10:55:55 -0800 |
parents | 1dc87d090f96 |
children | 8c8c7e8b7ab2 |
files | src/share/vm/jvmci/jvmciCompiler.cpp src/share/vm/jvmci/jvmciJavaClasses.cpp src/share/vm/jvmci/jvmciJavaClasses.hpp src/share/vm/jvmci/jvmciRuntime.cpp |
diffstat | 4 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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) }
--- 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. *
--- 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);