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

@@ -194,10 +194,12 @@
     protected static final String LINKTOSTATIC = START + "CallStaticJava" + MID + "linkToStatic" + END;
     protected static final String NPE = START + "CallStaticJava" + MID + "null_check" + END;
     protected static final String CALL = START + "CallStaticJava" + MID + END;
     protected static final String STOREVALUETYPEFIELDS = START + "CallStaticJava" + MID + "store_value_type_fields" + END;
     protected static final String SCOBJ = "(.*# ScObj.*" + END;
+    protected static final String LOAD_UNKNOWN_VALUE = "(.*call_leaf,runtime  load_unknown_value.*" + END;
+    protected static final String STORE_UNKNOWN_VALUE = "(.*call_leaf,runtime  store_unknown_value.*" + END;
 
     public static String[] concat(String prefix[], String... extra) {
         ArrayList<String> list = new ArrayList<String>();
         if (prefix != null) {
             for (String s : prefix) {

@@ -259,11 +261,12 @@
                 "-DVerifyIR=false",
                 "-XX:ValueArrayElemMaxFlatOops=-1",
                 "-XX:ValueArrayElemMaxFlatSize=-1",
                 "-XX:ValueFieldMaxFlatSize=0",
                 "-XX:+ValueTypePassFieldsAsArgs",
-                "-XX:-ValueTypeReturnedAsFields"};
+                "-XX:-ValueTypeReturnedAsFields",
+                "-XX:-ReduceInitialCardMarks"};
         case 5: return new String[] {
                 "-XX:+AlwaysIncrementalInline",
                 "-XX:ValueArrayElemMaxFlatOops=-1",
                 "-XX:ValueArrayElemMaxFlatSize=-1",
                 "-XX:ValueFieldMaxFlatSize=-1",