--- old/src/hotspot/share/oops/instanceKlass.hpp	2018-03-20 16:07:23.725752631 +0100
+++ new/src/hotspot/share/oops/instanceKlass.hpp	2018-03-20 16:07:23.421756703 +0100
@@ -1070,7 +1070,7 @@
 
   int  itable_offset_in_words() const { return start_of_itable() - (intptr_t*)this; }
 
-  oop static_field_base() { return java_mirror(); }
+  oop static_field_base_raw() { return java_mirror(); }
 
   OopMapBlock* start_of_nonstatic_oop_maps() const {
     return (OopMapBlock*)(start_of_itable() + itable_length());