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

*** 149,163 ****
--- 149,166 ----
      protected static final int ValueTypeArrayFlattenOff = 0x8;
      protected static final int ValueTypeReturnedAsFieldsOn = 0x10;
      protected static final int ValueTypeReturnedAsFieldsOff = 0x20;
      protected static final int AlwaysIncrementalInlineOn = 0x40;
      protected static final int AlwaysIncrementalInlineOff = 0x80;
+     protected static final int G1GCOn = 0x100;
+     protected static final int G1GCOff = 0x200;
      static final int AllFlags = ValueTypePassFieldsAsArgsOn | ValueTypePassFieldsAsArgsOff | ValueTypeArrayFlattenOn | ValueTypeArrayFlattenOff | ValueTypeReturnedAsFieldsOn;
      protected static final boolean ValueTypePassFieldsAsArgs = (Boolean)WHITE_BOX.getVMFlag("ValueTypePassFieldsAsArgs");
      protected static final boolean ValueTypeArrayFlatten = (WHITE_BOX.getIntxVMFlag("ValueArrayElemMaxFlatSize") == -1); // FIXME - fix this if default of ValueArrayElemMaxFlatSize is changed
      protected static final boolean ValueTypeReturnedAsFields = (Boolean)WHITE_BOX.getVMFlag("ValueTypeReturnedAsFields");
      protected static final boolean AlwaysIncrementalInline = (Boolean)WHITE_BOX.getVMFlag("AlwaysIncrementalInline");
+     protected static final boolean G1GC = (Boolean)WHITE_BOX.getVMFlag("UseG1GC");
      protected static final long TieredStopAtLevel = (Long)WHITE_BOX.getVMFlag("TieredStopAtLevel");
      protected static final int COMP_LEVEL_ANY               = -2;
      protected static final int COMP_LEVEL_ALL               = -2;
      protected static final int COMP_LEVEL_AOT               = -1;
      protected static final int COMP_LEVEL_NONE              =  0;
*** 178,187 ****
--- 181,191 ----
      protected static final String ALLOCA = "(.*precise klass \\[Lcompiler/valhalla/valuetypes/MyValue.*\\R(.*(nop|spill).*\\R)*.*_new_array_Java" + END;
      protected static final String LOAD   = START + "Load(B|S|I|L|F|D|P|N)" + MID + "@compiler/valhalla/valuetypes/MyValue.*" + END;
      protected static final String LOADK  = START + "LoadK" + MID + END;
      protected static final String STORE  = START + "Store(B|C|S|I|L|F|D|P|N)" + MID + "@compiler/valhalla/valuetypes/MyValue.*" + END;
      protected static final String LOOP   = START + "Loop" + MID + "" + END;
+     protected static final String COUNTEDLOOP = START + "CountedLoop\\b" + MID + "" + END;
      protected static final String TRAP   = START + "CallStaticJava" + MID + "uncommon_trap.*(unstable_if|predicate)" + END;
      protected static final String RETURN = START + "Return" + MID + "returns" + END;
      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;
*** 472,481 ****
--- 476,491 ----
                      assert anno == null;
                      anno = a;
                  } else if ((a.valid() & AlwaysIncrementalInlineOff) != 0 && !AlwaysIncrementalInline) {
                      assert anno == null;
                      anno = a;
+                 } else if ((a.valid() & G1GCOn) != 0 && G1GC) {
+                     assert anno == null;
+                     anno = a;
+                 } else if ((a.valid() & G1GCOff) != 0 && !G1GC) {
+                     assert anno == null;
+                     anno = a;
                  }
              }
              assert anno != null;
              String regexFail = anno.failOn();
              if (!regexFail.isEmpty()) {