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

@@ -76,12 +76,12 @@
     }
 
     private static final MyValue1 testValue1 = MyValue1.createWithFieldsInline(rI, rL);
 
     // Test nullable value type array creation and initialization
-    @Test(valid = ValueTypeArrayFlattenOn)
-    @Test(valid = ValueTypeArrayFlattenOff, failOn = LOAD)
+    @Test(valid = ValueTypeArrayFlattenOn, match = { ALLOCA }, matchCount = { 1 })
+    @Test(valid = ValueTypeArrayFlattenOff, match = { ALLOCA }, matchCount = { 1 }, failOn = LOAD)
     public MyValue1?[] test1(int len) {
         MyValue1?[] va = new MyValue1?[len];
         if (len > 0) {
             va[0] = null;
         }

@@ -1738,11 +1738,11 @@
             Asserts.assertEQ(va[i], null);
         }
     }
 
     // Check init store elimination
-    @Test
+    @Test(match = { ALLOCA }, matchCount = { 1 })
     public MyValue1?[] test66(MyValue1? vt) {
         MyValue1?[] va = new MyValue1?[1];
         va[0] = vt;
         return va;
     }

@@ -2241,11 +2241,11 @@
         va[0] = testValue1;
         long res = test83(va);
         Asserts.assertEquals(res, testValue1.hash());
     }
 
-    @Test(valid = ValueTypeArrayFlattenOn, failOn = ALLOC + ALLOCA + LOOP + STORE + TRAP)
+    @Test(valid = ValueTypeArrayFlattenOn, failOn = ALLOC + LOOP + STORE + TRAP)
     @Test(valid = ValueTypeArrayFlattenOff)
     public static MyValue1?[] test84(MyValue1 vt1, MyValue1? vt2) {
         MyValue1?[] result = new MyValue1[2];
         result[0] = vt1;
         result[1] = vt2;