hotspot/test/compiler/valhalla/valuetypes/ValueTypeTestBench.java

*** 25,61 ****
  
  /*
   * @test
   * @library /testlibrary /test/lib /compiler/whitebox /
   * @requires os.simpleArch == "x64"
!  * @modules java.base/jdk.internal.misc:+open
   * @compile -XDenableValueTypes ValueCapableClass1.java ValueCapableClass2.java ValueTypeTestBench.java
   * @run main ClassFileInstaller sun.hotspot.WhiteBox
   * @run main ClassFileInstaller jdk.test.lib.Platform
!  * @run main/othervm -Xbootclasspath/a:. -ea -noverify -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:+VerifyAdapterSharing -XX:+VerifyStack
   *                   -XX:+EnableValhalla -XX:+EnableMVT -XX:+ValueTypePassFieldsAsArgs -XX:+ValueTypeReturnedAsFields -XX:+ValueArrayFlatten
   *                   -XX:ValueArrayElemMaxFlatSize=-1 -XX:ValueArrayElemMaxFlatOops=-1
   *                   -Djdk.lang.reflect.DVT=true
   *                   compiler.valhalla.valuetypes.ValueTypeTestBench
!  * @run main/othervm -Xbootclasspath/a:. -ea -noverify -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:+VerifyStack
   *                   -XX:+EnableValhalla -XX:+EnableMVT -XX:-ValueTypePassFieldsAsArgs -XX:-ValueTypeReturnedAsFields -XX:-ValueArrayFlatten
   *                   -Djdk.lang.reflect.DVT=true
   *                   compiler.valhalla.valuetypes.ValueTypeTestBench
!  * @run main/othervm -Xbootclasspath/a:. -ea -noverify -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:+AlwaysIncrementalInline
   *                   -XX:+EnableValhalla -XX:+EnableMVT -XX:+ValueTypePassFieldsAsArgs -XX:+ValueTypeReturnedAsFields -XX:+ValueArrayFlatten
   *                   -XX:ValueArrayElemMaxFlatSize=-1 -XX:ValueArrayElemMaxFlatOops=-1
   *                   -Djdk.lang.reflect.DVT=true
   *                   compiler.valhalla.valuetypes.ValueTypeTestBench
   */
  
  package compiler.valhalla.valuetypes;
  
  import compiler.whitebox.CompilerWhiteBoxTest;
! import jdk.internal.misc.Unsafe;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.management.InputArguments;
  import jdk.test.lib.Platform;
  import jdk.test.lib.process.ProcessTools;
  import jdk.test.lib.process.OutputAnalyzer;
--- 25,64 ----
  
  /*
   * @test
   * @library /testlibrary /test/lib /compiler/whitebox /
   * @requires os.simpleArch == "x64"
!  * @modules java.base/jdk.experimental.value
!  *          java.base/jdk.internal.misc:+open
!  *          jdk.incubator.mvt
   * @compile -XDenableValueTypes ValueCapableClass1.java ValueCapableClass2.java ValueTypeTestBench.java
   * @run main ClassFileInstaller sun.hotspot.WhiteBox
   * @run main ClassFileInstaller jdk.test.lib.Platform
!  * @run main/othervm/timeout=120 -Xbootclasspath/a:. -ea -noverify -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:+VerifyAdapterSharing -XX:+VerifyStack
   *                   -XX:+EnableValhalla -XX:+EnableMVT -XX:+ValueTypePassFieldsAsArgs -XX:+ValueTypeReturnedAsFields -XX:+ValueArrayFlatten
   *                   -XX:ValueArrayElemMaxFlatSize=-1 -XX:ValueArrayElemMaxFlatOops=-1
   *                   -Djdk.lang.reflect.DVT=true
   *                   compiler.valhalla.valuetypes.ValueTypeTestBench
!  * @run main/othervm/timeout=120 -Xbootclasspath/a:. -ea -noverify -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:+VerifyStack
   *                   -XX:+EnableValhalla -XX:+EnableMVT -XX:-ValueTypePassFieldsAsArgs -XX:-ValueTypeReturnedAsFields -XX:-ValueArrayFlatten
   *                   -Djdk.lang.reflect.DVT=true
   *                   compiler.valhalla.valuetypes.ValueTypeTestBench
!  * @run main/othervm/timeout=120 -Xbootclasspath/a:. -ea -noverify -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:+AlwaysIncrementalInline
   *                   -XX:+EnableValhalla -XX:+EnableMVT -XX:+ValueTypePassFieldsAsArgs -XX:+ValueTypeReturnedAsFields -XX:+ValueArrayFlatten
   *                   -XX:ValueArrayElemMaxFlatSize=-1 -XX:ValueArrayElemMaxFlatOops=-1
   *                   -Djdk.lang.reflect.DVT=true
   *                   compiler.valhalla.valuetypes.ValueTypeTestBench
   */
  
  package compiler.valhalla.valuetypes;
  
  import compiler.whitebox.CompilerWhiteBoxTest;
! import jdk.experimental.value.MethodHandleBuilder;
! import jdk.incubator.mvt.ValueType;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.management.InputArguments;
  import jdk.test.lib.Platform;
  import jdk.test.lib.process.ProcessTools;
  import jdk.test.lib.process.OutputAnalyzer;
*** 73,83 ****
  import java.util.LinkedHashMap;
  import java.util.List;
  import java.util.Map;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
- import jdk.experimental.value.*;
  
  // Test value types
  __ByValue final class MyValue1 {
      static int s;
      static final long sf = ValueTypeTestBench.rL;
--- 76,85 ----