src/share/vm/prims/methodHandles.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 691,701 ****
    // Time to do the lookup.
    switch (flags & ALL_KINDS) {
    case IS_METHOD:
      {
        CallInfo result;
!       LinkInfo link_info(defc, name, type, caller, caller.not_null());
        {
          assert(!HAS_PENDING_EXCEPTION, "");
          if (ref_kind == JVM_REF_invokeStatic) {
            LinkResolver::resolve_static_call(result,
                          link_info, false, THREAD);
--- 691,701 ----
    // Time to do the lookup.
    switch (flags & ALL_KINDS) {
    case IS_METHOD:
      {
        CallInfo result;
!       LinkInfo link_info(defc, name, type, caller);
        {
          assert(!HAS_PENDING_EXCEPTION, "");
          if (ref_kind == JVM_REF_invokeStatic) {
            LinkResolver::resolve_static_call(result,
                          link_info, false, THREAD);
*** 728,738 ****
        return Handle(THREAD, mname2);
      }
    case IS_CONSTRUCTOR:
      {
        CallInfo result;
!       LinkInfo link_info(defc, name, type, caller, caller.not_null());
        {
          assert(!HAS_PENDING_EXCEPTION, "");
          if (name == vmSymbols::object_initializer_name()) {
            LinkResolver::resolve_special_call(result, link_info, THREAD);
          } else {
--- 728,738 ----
        return Handle(THREAD, mname2);
      }
    case IS_CONSTRUCTOR:
      {
        CallInfo result;
!       LinkInfo link_info(defc, name, type, caller);
        {
          assert(!HAS_PENDING_EXCEPTION, "");
          if (name == vmSymbols::object_initializer_name()) {
            LinkResolver::resolve_special_call(result, link_info, THREAD);
          } else {
*** 749,759 ****
    case IS_FIELD:
      {
        fieldDescriptor result; // find_field initializes fd if found
        {
          assert(!HAS_PENDING_EXCEPTION, "");
!         LinkInfo link_info(defc, name, type, caller, /*check_access*/false);
          LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, false, THREAD);
          if (HAS_PENDING_EXCEPTION) {
            return empty;
          }
        }
--- 749,759 ----
    case IS_FIELD:
      {
        fieldDescriptor result; // find_field initializes fd if found
        {
          assert(!HAS_PENDING_EXCEPTION, "");
!         LinkInfo link_info(defc, name, type, caller, LinkInfo::skip_access_check);
          LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, false, THREAD);
          if (HAS_PENDING_EXCEPTION) {
            return empty;
          }
        }