src/hotspot/share/classfile/javaClasses.cpp

@@ -1864,11 +1864,11 @@
 }
 #endif
 
 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);
 }
 
 oop java_lang_Throwable::backtrace(oop throwable) {
   return throwable->obj_field_acquire(backtrace_offset);

@@ -3541,17 +3541,17 @@
   return ref->long_field(timestamp_offset);
 }
 
 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);
 }
 
 // Support for java_lang_invoke_DirectMethodHandle
 

@@ -4127,11 +4127,11 @@
 int java_lang_System::err_offset_in_bytes() { return static_err_offset; }
 
 
 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));
 }
 
 int java_lang_Class::_klass_offset;
 int java_lang_Class::_array_klass_offset;