src/hotspot/share/jvmci/jvmciJavaClasses.cpp

*** 216,14 ***
  #define BOOLEAN_FIELD(className, name) FIELD(className, name, jboolean, bool_field, EMPTY_CAST)
  #define LONG_FIELD(className, name) FIELD(className, name, jlong, long_field, EMPTY_CAST)
  #define FLOAT_FIELD(className, name) FIELD(className, name, jfloat, float_field, EMPTY_CAST)
  
  #define OBJECT_FIELD(className, name, signature) FIELD(className, name, oop, obj_field, EMPTY_CAST)
! #define OBJECTARRAY_FIELD(className, name, signature) FIELD(className, name, objArrayOop, obj_field, (objArrayOop))
  #define PRIMARRAY_FIELD(className, name, signature) FIELD(className, name, typeArrayOop, obj_field, (typeArrayOop))
  #define STATIC_OBJECT_FIELD(className, name, signature) STATIC_OOPISH_FIELD(className, name, oop)
! #define STATIC_OBJECTARRAY_FIELD(className, name, signature) STATIC_OOPISH_FIELD(className, name, objArrayOop)
  #define STATIC_OOPISH_FIELD(className, name, type)                                                                        \
      type HotSpotJVMCI::className::name(JVMCIEnv* env) {                                                                   \
        assert(className::klass() != nullptr && className::klass()->is_linked(), "Class not yet linked: " #className);      \
        InstanceKlass* ik = className::klass();                                                                             \
        oop base = ik->static_field_base_raw();                                                                             \
--- 216,14 ---
  #define BOOLEAN_FIELD(className, name) FIELD(className, name, jboolean, bool_field, EMPTY_CAST)
  #define LONG_FIELD(className, name) FIELD(className, name, jlong, long_field, EMPTY_CAST)
  #define FLOAT_FIELD(className, name) FIELD(className, name, jfloat, float_field, EMPTY_CAST)
  
  #define OBJECT_FIELD(className, name, signature) FIELD(className, name, oop, obj_field, EMPTY_CAST)
! #define OBJECTARRAY_FIELD(className, name, signature) FIELD(className, name, refArrayOop, obj_field, (refArrayOop))
  #define PRIMARRAY_FIELD(className, name, signature) FIELD(className, name, typeArrayOop, obj_field, (typeArrayOop))
  #define STATIC_OBJECT_FIELD(className, name, signature) STATIC_OOPISH_FIELD(className, name, oop)
! #define STATIC_OBJECTARRAY_FIELD(className, name, signature) STATIC_OOPISH_FIELD(className, name, refArrayOop)
  #define STATIC_OOPISH_FIELD(className, name, type)                                                                        \
      type HotSpotJVMCI::className::name(JVMCIEnv* env) {                                                                   \
        assert(className::klass() != nullptr && className::klass()->is_linked(), "Class not yet linked: " #className);      \
        InstanceKlass* ik = className::klass();                                                                             \
        oop base = ik->static_field_base_raw();                                                                             \