test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java

*** 1,9 ****
  package compiler.jvmci.compilerToVM;
  
  import jdk.test.lib.Asserts;
! import jdk.test.lib.Pair;
  import jdk.test.lib.Utils;
  import jdk.vm.ci.code.InstalledCode;
  import jdk.vm.ci.code.InvalidInstalledCodeException;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
  import sun.hotspot.code.NMethod;
--- 1,9 ----
  package compiler.jvmci.compilerToVM;
  
  import jdk.test.lib.Asserts;
! import jdk.test.lib.util.Pair;
  import jdk.test.lib.Utils;
  import jdk.vm.ci.code.InstalledCode;
  import jdk.vm.ci.code.InvalidInstalledCodeException;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
  import sun.hotspot.code.NMethod;
*** 15,35 ****
  
  /*
   * @test
   * @bug 8136421
   * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
!  * @library /testlibrary /test/lib /
   * @library ../common/patches
   * @ignore 8139383
   * @modules java.base/jdk.internal.misc
   * @modules java.base/jdk.internal.org.objectweb.asm
   *          java.base/jdk.internal.org.objectweb.asm.tree
   *          jdk.vm.ci/jdk.vm.ci.hotspot
   *          jdk.vm.ci/jdk.vm.ci.code
!  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
!  * @build compiler.jvmci.compilerToVM.ExecuteInstalledCodeTest
!  * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:.
   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
   *                   -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- 15,33 ----
  
  /*
   * @test
   * @bug 8136421
   * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
!  * @library /test/lib /
   * @library ../common/patches
   * @ignore 8139383
   * @modules java.base/jdk.internal.misc
   * @modules java.base/jdk.internal.org.objectweb.asm
   *          java.base/jdk.internal.org.objectweb.asm.tree
   *          jdk.vm.ci/jdk.vm.ci.hotspot
   *          jdk.vm.ci/jdk.vm.ci.code
!  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:.
   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
   *                   -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI