*** old/src/share/vm/ci/ciField.cpp	Thu Jun  2 12:26:07 2016
--- new/src/share/vm/ci/ciField.cpp	Thu Jun  2 12:26:07 2016

*** 339,348 ****
--- 339,349 ----
  // ciField::will_link
  //
  // 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 ||
           bc == Bytecodes::_getfield  || bc == Bytecodes::_putfield,
           "unexpected bytecode");

*** 372,382 ****
--- 373,383 ----
      }
    }
  
    LinkInfo link_info(_holder->get_instanceKlass(),
                       _name->get_symbol(), _signature->get_symbol(),
!                      accessing_klass->get_Klass(), accessing_method->get_Method());
    fieldDescriptor result;
    LinkResolver::resolve_field(result, link_info, bc, false, KILL_COMPILE_ON_FATAL_(false));
  
    // update the hit-cache, unless there is a problem with memory scoping:
    if (accessing_klass->is_shared() || !is_shared()) {