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

*** 45,57 ****
--- 45,72 ----
   *                               -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:+EnableValhalla
   *                               compiler.valhalla.valuetypes.ValueTypeTest
   *                               compiler.valhalla.valuetypes.TestLWorld
   */
  public class TestLWorld extends ValueTypeTest {
+     public int getNumScenarios() {
+         if (TEST_C1) {
+             return 2;
+         } else {
+             return super.getNumScenarios();
+         }
+     }
+ 
      // Extra VM parameters for some test scenarios. See ValueTypeTest.getVMParameters()
      @Override
      public String[] getExtraVMParameters(int scenario) {
+         if (TEST_C1) {
+             switch (scenario) {
+             case 1:  return new String[] {"-XX:-UseBiasedLocking"};
+             }
+             return null;
+         }
+ 
          switch (scenario) {
          case 1: return new String[] {"-XX:-UseOptoBiasInlining"};
          case 2: return new String[] {"-XX:-UseBiasedLocking"};
          case 3: return new String[] {"-XX:-MonomorphicArrayCheck", "-XX:-UseBiasedLocking", "-XX:+ValueArrayFlatten"};
          case 4: return new String[] {"-XX:-MonomorphicArrayCheck"};
*** 1157,1166 ****
--- 1172,1184 ----
          return result;
      }
  
      @DontCompile
      public void test39_verifier(boolean warmup) {
+         if (!ENABLE_VALUE_ARRAY_COVARIANCE) {
+             return;
+         }
          int index = Math.abs(rI) % 3;
          MyValue1[] va = new MyValue1[42];
          Object result = test39(null, testValue1, index, index, 0);
          Asserts.assertEQ(((MyValue1[])result)[index].hash(), testValue1.hash());
          result = test39(testValue1Array, testValue1, index, index, 1);