--- old/src/share/vm/c1/c1_GraphBuilder.cpp	2016-06-10 19:38:02.610926310 +0200
+++ new/src/share/vm/c1/c1_GraphBuilder.cpp	2016-06-10 19:38:02.378926303 +0200
@@ -1600,7 +1600,7 @@
   ValueType* type = as_ValueType(field_type);
   // call will_link again to determine if the field is valid.
   const bool needs_patching = !holder->is_loaded() ||
-                              !field->will_link(method()->holder(), code) ||
+                              !field->will_link(method(), code) ||
                               PatchALot;
 
   ValueStack* state_before = NULL;