src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java

*** 20,34 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package jdk.vm.ci.hotspot;
  
! import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.*;
! import static jdk.vm.ci.hotspot.HotSpotResolvedObjectTypeImpl.*;
! 
! import jdk.vm.ci.common.*;
! import jdk.vm.ci.meta.*;
  
  public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider, HotSpotProxified {
  
      private final ConstantReflectionProvider constantReflection;
  
--- 20,39 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package jdk.vm.ci.hotspot;
  
! import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
! import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
! import static jdk.vm.ci.hotspot.HotSpotResolvedObjectTypeImpl.fromObjectClass;
! import jdk.vm.ci.common.JVMCIError;
! import jdk.vm.ci.meta.ConstantReflectionProvider;
! import jdk.vm.ci.meta.JavaConstant;
! import jdk.vm.ci.meta.MethodHandleAccessProvider;
! import jdk.vm.ci.meta.ResolvedJavaField;
! import jdk.vm.ci.meta.ResolvedJavaMethod;
! import jdk.vm.ci.meta.ResolvedJavaType;
  
  public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider, HotSpotProxified {
  
      private final ConstantReflectionProvider constantReflection;
  
*** 153,160 ****
              return null;
          }
  
          Object object = ((HotSpotObjectConstantImpl) memberName).object();
          /* Read the ResolvedJavaMethod from the injected field MemberName.vmtarget */
!         return runtime().compilerToVm.getResolvedJavaMethod(object, LazyInitialization.memberNameVmtargetField.offset());
      }
  }
--- 158,165 ----
              return null;
          }
  
          Object object = ((HotSpotObjectConstantImpl) memberName).object();
          /* Read the ResolvedJavaMethod from the injected field MemberName.vmtarget */
!         return compilerToVM().getResolvedJavaMethod(object, LazyInitialization.memberNameVmtargetField.offset());
      }
  }