test/hotspot/jtreg/compiler/valhalla/valuetypes/TestMethodHandles.java

*** 41,59 ****
--- 41,63 ----
   *          java.base/jdk.internal.misc:+open
   * @compile -XDemitQtypes -XDenableValueTypes -XDallowWithFieldOperator -XDallowFlattenabilityModifiers TestMethodHandles.java
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.Platform
   * @run main/othervm/timeout=120 -Xbootclasspath/a:. -ea -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
   *                               -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:+EnableValhalla
+  *                               -DVerifyIR=false
   *                               compiler.valhalla.valuetypes.ValueTypeTest
   *                               compiler.valhalla.valuetypes.TestMethodHandles
   */
  public class TestMethodHandles extends ValueTypeTest {
      // Extra VM parameters for some test scenarios. See ValueTypeTest.getVMParameters()
      @Override
      public String[] getExtraVMParameters(int scenario) {
          switch (scenario) {
+         // Prevent inlining through MethodHandle linkTo adapters to stress the calling convention
+         case 2: return new String[] {"-XX:CompileCommand=dontinline,java.lang.invoke.DirectMethodHandle::internalMemberName"};
          case 3: return new String[] {"-XX:-ValueArrayFlatten"};
+         case 4: return new String[] {"-XX:CompileCommand=dontinline,java.lang.invoke.DirectMethodHandle::internalMemberName"};
          }
          return null;
      }
  
      static {