--- old/src/hotspot/share/jvmci/jvmciJavaClasses.hpp 2018-06-04 13:11:40.399346147 -0400 +++ new/src/hotspot/share/jvmci/jvmciJavaClasses.hpp 2018-06-04 13:11:40.029311867 -0400 @@ -25,10 +25,9 @@ #define SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP #include "classfile/systemDictionary.hpp" -#include "oops/access.inline.hpp" +#include "oops/access.hpp" #include "oops/instanceMirrorKlass.hpp" -#include "oops/oop.inline.hpp" -#include "runtime/jniHandles.inline.hpp" +#include "oops/oop.hpp" class JVMCIJavaClasses : AllStatic { public: @@ -243,19 +242,19 @@ end_class \ start_class(JavaKind) \ char_field(JavaKind, typeChar) \ - static_oop_field(JavaKind, Boolean, "Ljdk/vm/ci/meta/JavaKind;"); \ - static_oop_field(JavaKind, Byte, "Ljdk/vm/ci/meta/JavaKind;"); \ - static_oop_field(JavaKind, Char, "Ljdk/vm/ci/meta/JavaKind;"); \ - static_oop_field(JavaKind, Short, "Ljdk/vm/ci/meta/JavaKind;"); \ - static_oop_field(JavaKind, Int, "Ljdk/vm/ci/meta/JavaKind;"); \ - static_oop_field(JavaKind, Long, "Ljdk/vm/ci/meta/JavaKind;"); \ + static_oop_field(JavaKind, Boolean, "Ljdk/vm/ci/meta/JavaKind;") \ + static_oop_field(JavaKind, Byte, "Ljdk/vm/ci/meta/JavaKind;") \ + static_oop_field(JavaKind, Char, "Ljdk/vm/ci/meta/JavaKind;") \ + static_oop_field(JavaKind, Short, "Ljdk/vm/ci/meta/JavaKind;") \ + static_oop_field(JavaKind, Int, "Ljdk/vm/ci/meta/JavaKind;") \ + static_oop_field(JavaKind, Long, "Ljdk/vm/ci/meta/JavaKind;") \ end_class \ start_class(ValueKind) \ oop_field(ValueKind, platformKind, "Ljdk/vm/ci/meta/PlatformKind;") \ end_class \ start_class(Value) \ oop_field(Value, valueKind, "Ljdk/vm/ci/meta/ValueKind;") \ - static_oop_field(Value, ILLEGAL, "Ljdk/vm/ci/meta/AllocatableValue;"); \ + static_oop_field(Value, ILLEGAL, "Ljdk/vm/ci/meta/AllocatableValue;") \ end_class \ start_class(RegisterValue) \ oop_field(RegisterValue, reg, "Ljdk/vm/ci/code/Register;") \ @@ -317,11 +316,7 @@ class name : AllStatic { \ private: \ friend class JVMCICompiler; \ - static void check(oop obj, const char* field_name, int offset) { \ - assert(obj != NULL, "NULL field access of %s.%s", #name, field_name); \ - assert(obj->is_a(SystemDictionary::name##_klass()), "wrong class, " #name " expected, found %s", obj->klass()->external_name()); \ - assert(offset != 0, "must be valid offset"); \ - } \ + static void check(oop obj, const char* field_name, int offset); \ static void compute_offsets(TRAPS); \ public: \ static InstanceKlass* klass() { return SystemDictionary::name##_klass(); } @@ -330,12 +325,12 @@ #define FIELD(name, type, accessor, cast) \ static int _##name##_offset; \ - static type name(oop obj) { check(obj, #name, _##name##_offset); return cast obj->accessor(_##name##_offset); } \ - static type name(Handle obj) { check(obj(), #name, _##name##_offset); return cast obj->accessor(_##name##_offset); } \ - static type name(jobject obj) { check(JNIHandles::resolve(obj), #name, _##name##_offset); return cast JNIHandles::resolve(obj)->accessor(_##name##_offset); } \ - static void set_##name(oop obj, type x) { check(obj, #name, _##name##_offset); obj->accessor##_put(_##name##_offset, x); } \ - static void set_##name(Handle obj, type x) { check(obj(), #name, _##name##_offset); obj->accessor##_put(_##name##_offset, x); } \ - static void set_##name(jobject obj, type x) { check(JNIHandles::resolve(obj), #name, _##name##_offset); JNIHandles::resolve(obj)->accessor##_put(_##name##_offset, x); } + static type name(oop obj) { check(obj, #name, _##name##_offset); return cast obj->accessor(_##name##_offset); } \ + static type name(Handle obj) { check(obj(), #name, _##name##_offset); return cast obj->accessor(_##name##_offset); } \ + static type name(jobject obj); \ + static void set_##name(oop obj, type x) { check(obj, #name, _##name##_offset); obj->accessor##_put(_##name##_offset, x); } \ + static void set_##name(Handle obj, type x) { check(obj(), #name, _##name##_offset); obj->accessor##_put(_##name##_offset, x); } \ + static void set_##name(jobject obj, type x); \ #define EMPTY_CAST #define CHAR_FIELD(klass, name) FIELD(name, jchar, char_field, EMPTY_CAST) @@ -350,34 +345,12 @@ #define STATIC_OBJARRAYOOP_FIELD(klassName, name, signature) STATIC_OOPISH_FIELD(klassName, name, objArrayOop, signature) #define STATIC_OOPISH_FIELD(klassName, name, type, signature) \ static int _##name##_offset; \ - static type name() { \ - assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \ - InstanceKlass* ik = klassName::klass(); \ - oop base = ik->static_field_base_raw(); \ - oop result = HeapAccess<>::oop_load_at(base, _##name##_offset); \ - return type(result); \ - } \ - static void set_##name(type x) { \ - assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \ - assert(klassName::klass() != NULL, "Class not yet loaded: " #klassName); \ - InstanceKlass* ik = klassName::klass(); \ - oop base = ik->static_field_base_raw(); \ - HeapAccess<>::oop_store_at(base, _##name##_offset, x); \ - } + static type name(); \ + static void set_##name(type x); #define STATIC_PRIMITIVE_FIELD(klassName, name, jtypename) \ static int _##name##_offset; \ - static jtypename name() { \ - assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \ - InstanceKlass* ik = klassName::klass(); \ - oop base = ik->static_field_base_raw(); \ - return HeapAccess<>::load_at(base, _##name##_offset); \ - } \ - static void set_##name(jtypename x) { \ - assert(klassName::klass() != NULL && klassName::klass()->is_linked(), "Class not yet linked: " #klassName); \ - InstanceKlass* ik = klassName::klass(); \ - oop base = ik->static_field_base_raw(); \ - HeapAccess<>::store_at(base, _##name##_offset, x); \ - } + static jtypename name(); \ + static void set_##name(jtypename x); #define STATIC_INT_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jint) #define STATIC_BOOLEAN_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jboolean) @@ -399,6 +372,7 @@ #undef STATIC_OBJARRAYOOP_FIELD #undef STATIC_INT_FIELD #undef STATIC_BOOLEAN_FIELD +#undef STATIC_PRIMITIVE_FIELD #undef EMPTY_CAST void compute_offset(int &dest_offset, Klass* klass, const char* name, const char* signature, bool static_field, TRAPS);