test/compiler/jvmci/compilerToVM/ResolveMethodTest.java

*** 47,58 ****
  import compiler.jvmci.common.testcases.SingleSubclassedClass;
  import compiler.jvmci.common.CTVMUtilities;
  import java.util.HashSet;
  import java.util.Set;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
! import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethodImpl;
! import jdk.vm.ci.hotspot.HotSpotResolvedObjectTypeImpl;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.Utils;
  import sun.misc.Unsafe;
  
  public class ResolveMethodTest {
--- 47,58 ----
  import compiler.jvmci.common.testcases.SingleSubclassedClass;
  import compiler.jvmci.common.CTVMUtilities;
  import java.util.HashSet;
  import java.util.Set;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
! import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
! import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.Utils;
  import sun.misc.Unsafe;
  
  public class ResolveMethodTest {
*** 123,142 ****
          return result;
      }
  
      private void runTest(TestCase tcase) throws NoSuchMethodException {
          System.out.println(tcase);
!         HotSpotResolvedJavaMethodImpl metaspaceMethod = CTVMUtilities
                  .getResolvedMethod(tcase.holder,
                          tcase.holder.getDeclaredMethod(tcase.methodName));
!         HotSpotResolvedObjectTypeImpl holderMetaspace = CompilerToVMHelper
                  .lookupType(Utils.toJVMTypeSignature(tcase.holder),
                          getClass(), /* resolve = */ true);
!         HotSpotResolvedObjectTypeImpl callerMetaspace = CompilerToVMHelper
                  .lookupType(Utils.toJVMTypeSignature(tcase.caller),
                          getClass(), /* resolve = */ true);
!         HotSpotResolvedJavaMethodImpl resolvedMetaspaceMethod
                  = CompilerToVMHelper.resolveMethod(holderMetaspace,
                          metaspaceMethod, callerMetaspace);
          if (tcase.isPositive) {
              Asserts.assertNotNull(resolvedMetaspaceMethod,
                      "Unexpected null resolved method value for "
--- 123,142 ----
          return result;
      }
  
      private void runTest(TestCase tcase) throws NoSuchMethodException {
          System.out.println(tcase);
!         HotSpotResolvedJavaMethod metaspaceMethod = CTVMUtilities
                  .getResolvedMethod(tcase.holder,
                          tcase.holder.getDeclaredMethod(tcase.methodName));
!         HotSpotResolvedObjectType holderMetaspace = CompilerToVMHelper
                  .lookupType(Utils.toJVMTypeSignature(tcase.holder),
                          getClass(), /* resolve = */ true);
!         HotSpotResolvedObjectType callerMetaspace = CompilerToVMHelper
                  .lookupType(Utils.toJVMTypeSignature(tcase.caller),
                          getClass(), /* resolve = */ true);
!         HotSpotResolvedJavaMethod resolvedMetaspaceMethod
                  = CompilerToVMHelper.resolveMethod(holderMetaspace,
                          metaspaceMethod, callerMetaspace);
          if (tcase.isPositive) {
              Asserts.assertNotNull(resolvedMetaspaceMethod,
                      "Unexpected null resolved method value for "