test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java

*** 42,53 ****
  import compiler.jvmci.common.testcases.SingleImplementer;
  import compiler.jvmci.common.testcases.SingleImplementerInterface;
  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;
  
  public class GetClassInitializerTest {
  
--- 42,53 ----
  import compiler.jvmci.common.testcases.SingleImplementer;
  import compiler.jvmci.common.testcases.SingleImplementerInterface;
  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;
  
  public class GetClassInitializerTest {
  
*** 76,89 ****
      }
  
      private void runTest(TestCase tcase) {
          System.out.println(tcase);
          String className = tcase.holder.getName();
!         HotSpotResolvedObjectTypeImpl resolvedClazz = CompilerToVMHelper
                  .lookupType(Utils.toJVMTypeSignature(tcase.holder),
                          getClass(), /* resolve = */ true);
!         HotSpotResolvedJavaMethodImpl initializer = CompilerToVMHelper
                  .getClassInitializer(resolvedClazz);
          if (tcase.isPositive) {
              Asserts.assertNotNull(initializer, "Couldn't get initializer for "
                      + className);
              Asserts.assertEQ(initializer.getName(), "<clinit>",
--- 76,89 ----
      }
  
      private void runTest(TestCase tcase) {
          System.out.println(tcase);
          String className = tcase.holder.getName();
!         HotSpotResolvedObjectType resolvedClazz = CompilerToVMHelper
                  .lookupType(Utils.toJVMTypeSignature(tcase.holder),
                          getClass(), /* resolve = */ true);
!         HotSpotResolvedJavaMethod initializer = CompilerToVMHelper
                  .getClassInitializer(resolvedClazz);
          if (tcase.isPositive) {
              Asserts.assertNotNull(initializer, "Couldn't get initializer for "
                      + className);
              Asserts.assertEQ(initializer.getName(), "<clinit>",