test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java

*** 20,30 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! /**
   * @test
   * @bug 8136421
   * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
   * @library /testlibrary /
   * @run main/othervm -XX:+UnlockExperimentalVMOptions
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! /*
   * @test
   * @bug 8136421
   * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
   * @library /testlibrary /
   * @run main/othervm -XX:+UnlockExperimentalVMOptions
*** 38,48 ****
  
   */
  
  package compiler.jvmci.compilerToVM;
  
- import jdk.vm.ci.hotspot.CompilerToVM;
  import jdk.vm.ci.runtime.JVMCI;
  import jdk.test.lib.Asserts;
  
  import java.lang.reflect.Method;
  
--- 38,47 ----
*** 86,98 ****
      }
  
      private JVM_RegisterJVMCINatives() {
          Method method;
          try {
!             method = CompilerToVM.class.getDeclaredMethod("registerNatives");
              method.setAccessible(true);
!         } catch (NoSuchMethodException e) {
              throw new Error("can't find CompilerToVM::registerNatives", e);
          }
          registerNatives = method;
      }
  }
--- 85,100 ----
      }
  
      private JVM_RegisterJVMCINatives() {
          Method method;
          try {
!             method = Class.forName("jdk.vm.ci.hotspot.CompilerToVM",
!                     /* initialize = */ false,
!                     this.getClass().getClassLoader())
!                     .getDeclaredMethod("registerNatives");
              method.setAccessible(true);
!         } catch (ReflectiveOperationException e) {
              throw new Error("can't find CompilerToVM::registerNatives", e);
          }
          registerNatives = method;
      }
  }