src/cpu/zero/vm/methodHandles_zero.cpp

*** 22,32 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
! #include "interpreter/interpreterGenerator.hpp"
  #include "interpreter/interpreter.hpp"
  #include "memory/allocation.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "prims/methodHandles.hpp"
  
--- 22,32 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
! #include "interpreter/cppInterpreterGenerator.hpp"
  #include "interpreter/interpreter.hpp"
  #include "memory/allocation.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "prims/methodHandles.hpp"
  
*** 165,184 ****
    case vmIntrinsics::_invokeGeneric:
    case vmIntrinsics::_compiledLambdaForm:
      // Perhaps surprisingly, the symbolic references visible to Java are not directly used.
      // They are linked to Java-generated adapters via MethodHandleNatives.linkMethod.
      // They all allow an appendix argument.
!     return InterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_invalid);
    case vmIntrinsics::_invokeBasic:
!     return InterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_invokeBasic);
    case vmIntrinsics::_linkToStatic:
    case vmIntrinsics::_linkToSpecial:
!     return InterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_linkToStaticOrSpecial);
    case vmIntrinsics::_linkToInterface:
!     return InterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_linkToInterface);
    case vmIntrinsics::_linkToVirtual:
!     return InterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_linkToVirtual);
    default:
      ShouldNotReachHere();
      return NULL;
    }
  }
--- 165,184 ----
    case vmIntrinsics::_invokeGeneric:
    case vmIntrinsics::_compiledLambdaForm:
      // Perhaps surprisingly, the symbolic references visible to Java are not directly used.
      // They are linked to Java-generated adapters via MethodHandleNatives.linkMethod.
      // They all allow an appendix argument.
!     return CppInterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_invalid);
    case vmIntrinsics::_invokeBasic:
!     return CppInterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_invokeBasic);
    case vmIntrinsics::_linkToStatic:
    case vmIntrinsics::_linkToSpecial:
!     return CppInterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_linkToStaticOrSpecial);
    case vmIntrinsics::_linkToInterface:
!     return CppInterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_linkToInterface);
    case vmIntrinsics::_linkToVirtual:
!     return CppInterpreterGenerator::generate_entry_impl(masm, (address) MethodHandles::method_handle_entry_linkToVirtual);
    default:
      ShouldNotReachHere();
      return NULL;
    }
  }