--- old/src/share/vm/ci/ciField.cpp	2016-06-02 12:26:07.498263844 +0200
+++ new/src/share/vm/ci/ciField.cpp	2016-06-02 12:26:07.126263856 +0200
@@ -341,6 +341,7 @@
 // Can a specific access to this field be made without causing
 // link errors?
 bool ciField::will_link(ciInstanceKlass* accessing_klass,
+                        ciMethod* accessing_method,
                         Bytecodes::Code bc) {
   VM_ENTRY_MARK;
   assert(bc == Bytecodes::_getstatic || bc == Bytecodes::_putstatic ||
@@ -374,7 +375,7 @@
 
   LinkInfo link_info(_holder->get_instanceKlass(),
                      _name->get_symbol(), _signature->get_symbol(),
-                     accessing_klass->get_Klass());
+                     accessing_klass->get_Klass(), accessing_method->get_Method());
   fieldDescriptor result;
   LinkResolver::resolve_field(result, link_info, bc, false, KILL_COMPILE_ON_FATAL_(false));