--- old/src/hotspot/share/classfile/javaClasses.cpp	2018-03-20 16:07:21.753779041 +0100
+++ new/src/hotspot/share/classfile/javaClasses.cpp	2018-03-20 16:07:21.435783300 +0100
@@ -1866,7 +1866,7 @@
 
 oop java_lang_Throwable::unassigned_stacktrace() {
   InstanceKlass* ik = SystemDictionary::Throwable_klass();
-  oop base = ik->static_field_base();
+  oop base = ik->static_field_base_raw();
   return base->obj_field(static_unassigned_stacktrace_offset);
 }
 
@@ -3543,13 +3543,13 @@
 
 jlong java_lang_ref_SoftReference::clock() {
   InstanceKlass* ik = SystemDictionary::SoftReference_klass();
-  oop base = ik->static_field_base();
+  oop base = ik->static_field_base_raw();
   return base->long_field(static_clock_offset);
 }
 
 void java_lang_ref_SoftReference::set_clock(jlong value) {
   InstanceKlass* ik = SystemDictionary::SoftReference_klass();
-  oop base = ik->static_field_base();
+  oop base = ik->static_field_base_raw();
   base->long_field_put(static_clock_offset, value);
 }
 
@@ -4129,7 +4129,7 @@
 
 bool java_lang_System::has_security_manager() {
   InstanceKlass* ik = SystemDictionary::System_klass();
-  oop base = ik->static_field_base();
+  oop base = ik->static_field_base_raw();
   return !oopDesc::is_null(base->obj_field(static_security_offset));
 }