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

@@ -196,11 +196,11 @@
         Asserts.assertEQ(test8(false), hash(rI + 1, rL + 1));
     }
 
     // Merge value types created from two branches
     @Test(valid = ValueTypePassFieldsAsArgsOn, match = {LOAD}, matchCount = {10}, failOn = TRAP + ALLOC + STORE)
-    @Test(valid = ValueTypePassFieldsAsArgsOff, match = {ALLOC, STORE}, matchCount = {1, 3}, failOn = LOAD + TRAP)
+    @Test(valid = ValueTypePassFieldsAsArgsOff, match = {ALLOC, STORE}, matchCount = {1, 5}, failOn = LOAD + TRAP)
     public MyValue1 test9(boolean b) {
         MyValue1 v;
         if (b) {
             // Value type is not allocated
             v = MyValue1.createWithFieldsInline(rI, rL);

@@ -489,11 +489,11 @@
         long result = test22();
         Asserts.assertEQ(result, val5.hash() + val5.v3.hash());
     }
 
     // Test defaultvalue
-    @Test(failOn = ALLOC + LOAD + LOADP + STORE + LOOP + TRAP)
+    @Test(failOn = ALLOC + LOAD + STORE + LOOP + TRAP)
     public long test23() {
         MyValue2 v = MyValue2.createDefaultInline();
         return v.hash();
     }
 

@@ -516,11 +516,11 @@
         long result = test24();
         Asserts.assertEQ(result, 2 * MyValue1.createDefaultInline().hashPrimitive());
     }
 
     // Test withfield
-    @Test(failOn = ALLOC + LOAD + LOADP + STORE + LOOP + TRAP)
+    @Test(failOn = ALLOC + LOAD + STORE + LOOP + TRAP)
     public long test25() {
         MyValue2 v = MyValue2.createWithFieldsInline(rI, true);
         return v.hash();
     }