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

@@ -1834,11 +1834,11 @@
         MyValue1 v = MyValue1.createWithFieldsInline(rI, rL);
         Asserts.assertEQ(test78(v, 1), v.hash());
     }
 
     // Verify that casting an array element to a non-flattenable type marks the array as not-flat
-    @Test(valid = ValueTypeArrayFlattenOn, match = { ALLOC_G, LOAD_UNKNOWN_VALUE }, matchCount = { 1, 1 })
+    @Test(valid = ValueTypeArrayFlattenOn, failOn = ALLOC_G + LOAD_UNKNOWN_VALUE)
     @Test(valid = ValueTypeArrayFlattenOff, failOn = ALLOC_G + ALLOCA_G + LOAD_UNKNOWN_VALUE)
     public Object test79(Object[] array, int i) {
         Integer i1 = (Integer)array[0];
         Object o = array[1];
         return array[i];

@@ -1861,11 +1861,11 @@
         private final Object o5 = null;
         private final Object o6 = null;
     }
 
     // Same as test80 but with not-flattenable inline type
-    @Test(valid = ValueTypeArrayFlattenOn, match = { ALLOC_G, LOAD_UNKNOWN_VALUE }, matchCount = { 1, 1 })
+    @Test(valid = ValueTypeArrayFlattenOn, failOn = ALLOC_G + LOAD_UNKNOWN_VALUE)
     @Test(valid = ValueTypeArrayFlattenOff, failOn = ALLOC_G + ALLOCA_G + LOAD_UNKNOWN_VALUE)
     public Object test80(Object[] array, int i) {
         NotFlattenable vt = (NotFlattenable)array[0];
         Object o = array[1];
         return array[i];

@@ -1935,11 +1935,11 @@
         Asserts.assertEquals(array2[2], vt);
         Asserts.assertEquals(result, vt);
     }
 
     // Verify that casting an array element to a non-inline type type marks the array as not-null-free and not-flat
-    @Test(valid = ValueTypeArrayFlattenOn, match = { ALLOC_G, LOAD_UNKNOWN_VALUE }, matchCount = { 1, 1 }, failOn = ALLOCA_G + STORE_UNKNOWN_VALUE + VALUE_ARRAY_NULL_GUARD)
+    @Test(valid = ValueTypeArrayFlattenOn, failOn = ALLOC_G + LOAD_UNKNOWN_VALUE + ALLOCA_G + STORE_UNKNOWN_VALUE + VALUE_ARRAY_NULL_GUARD)
     @Test(valid = ValueTypeArrayFlattenOff, failOn = ALLOC_G + ALLOCA_G + LOAD_UNKNOWN_VALUE + STORE_UNKNOWN_VALUE + VALUE_ARRAY_NULL_GUARD)
     public void test83(Object[] array, Object o) {
         Integer i = (Integer)array[0];
         array[1] = o;
     }