--- old/src/hotspot/share/jvmci/jvmciJavaClasses.hpp	2018-03-20 16:07:22.765765488 +0100
+++ new/src/hotspot/share/jvmci/jvmciJavaClasses.hpp	2018-03-20 16:07:22.471769425 +0100
@@ -353,7 +353,7 @@
     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();                                                                      \
+      oop base = ik->static_field_base_raw();                                                                  \
       oop result = HeapAccess<>::oop_load_at(base, _##name##_offset);                                          \
       return type(result);                                                                                     \
     }                                                                                                          \
@@ -361,22 +361,22 @@
       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();                                                                      \
-      HeapAccess<>::oop_store_at(base, _##name##_offset, x);                                                      \
+      oop base = ik->static_field_base_raw();                                                                  \
+      HeapAccess<>::oop_store_at(base, _##name##_offset, 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();                                                                      \
-      return HeapAccess<>::load_at(base, _##name##_offset);                                                       \
+      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();                                                                      \
-      HeapAccess<>::store_at(base, _##name##_offset, x);                                                          \
+      oop base = ik->static_field_base_raw();                                                                  \
+      HeapAccess<>::store_at(base, _##name##_offset, x);                                                       \
     }
 
 #define STATIC_INT_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jint)