--- old/src/share/vm/oops/instanceKlass.hpp	2017-04-25 16:45:21.291173580 +0200
+++ new/src/share/vm/oops/instanceKlass.hpp	2017-04-25 16:45:21.143173585 +0200
@@ -641,9 +641,7 @@
 
   // Oop that keeps the metadata for this class from being unloaded
   // in places where the metadata is stored in other places, like nmethods
-  oop klass_holder() const {
-    return is_anonymous() ? java_mirror() : class_loader();
-  }
+  oop* klass_holder_addr() const;
 
   bool is_contended() const                {
     return (_misc_flags & _misc_is_contended) != 0;