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

*** 108,118 ****
          "-XX:CompileCommand=compileonly,java.lang.Long::sum",
          "-XX:CompileCommand=compileonly,java.lang.Object::<init>",
          "-XX:CompileCommand=compileonly,compiler.valhalla.valuetypes.*::*");
      private static final List<String> verifyFlags = Arrays.asList(
          "-XX:+VerifyOops", "-XX:+VerifyStack", "-XX:+VerifyLastFrame", "-XX:+VerifyBeforeGC", "-XX:+VerifyAfterGC",
!         "-XX:+VerifyDuringGC", "-XX:+VerifyAdapterSharing", "-XX:+StressValueTypeReturnedAsFields");
  
      protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
      protected static final int ValueTypePassFieldsAsArgsOn = 0x1;
      protected static final int ValueTypePassFieldsAsArgsOff = 0x2;
      protected static final int ValueTypeArrayFlattenOn = 0x4;
--- 108,118 ----
          "-XX:CompileCommand=compileonly,java.lang.Long::sum",
          "-XX:CompileCommand=compileonly,java.lang.Object::<init>",
          "-XX:CompileCommand=compileonly,compiler.valhalla.valuetypes.*::*");
      private static final List<String> verifyFlags = Arrays.asList(
          "-XX:+VerifyOops", "-XX:+VerifyStack", "-XX:+VerifyLastFrame", "-XX:+VerifyBeforeGC", "-XX:+VerifyAfterGC",
!         "-XX:+VerifyDuringGC", "-XX:+VerifyAdapterSharing");
  
      protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
      protected static final int ValueTypePassFieldsAsArgsOn = 0x1;
      protected static final int ValueTypePassFieldsAsArgsOff = 0x2;
      protected static final int ValueTypeArrayFlattenOn = 0x4;
*** 137,147 ****
      protected static final String END = ")|";
      protected static final String ALLOC  = "(.*precise klass compiler/valhalla/valuetypes/MyValue.*\\R(.*(nop|spill).*\\R)*.*_new_instance_Java" + END;
      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|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 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;
--- 137,147 ----
      protected static final String END = ")|";
      protected static final String ALLOC  = "(.*precise klass compiler/valhalla/valuetypes/MyValue.*\\R(.*(nop|spill).*\\R)*.*_new_instance_Java" + END;
      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 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;
*** 201,211 ****
                  "-XX:ValueArrayElemMaxFlatOops=0",
                  "-XX:ValueArrayElemMaxFlatSize=0",
                  "-XX:-ValueArrayFlatten",
                  "-XX:ValueFieldMaxFlatSize=0",
                  "-XX:+ValueTypePassFieldsAsArgs",
!                 "-XX:+ValueTypeReturnedAsFields"};
          case 3: return new String[] {
                  "-DVerifyIR=false",
                  "-XX:+AlwaysIncrementalInline",
                  "-XX:ValueArrayElemMaxFlatOops=0",
                  "-XX:ValueArrayElemMaxFlatSize=0",
--- 201,213 ----
                  "-XX:ValueArrayElemMaxFlatOops=0",
                  "-XX:ValueArrayElemMaxFlatSize=0",
                  "-XX:-ValueArrayFlatten",
                  "-XX:ValueFieldMaxFlatSize=0",
                  "-XX:+ValueTypePassFieldsAsArgs",
!                 "-XX:+ValueTypeReturnedAsFields",
!                 "-XX:+StressValueTypePassFieldsAsArgs",
!                 "-XX:+StressValueTypeReturnedAsFields"};
          case 3: return new String[] {
                  "-DVerifyIR=false",
                  "-XX:+AlwaysIncrementalInline",
                  "-XX:ValueArrayElemMaxFlatOops=0",
                  "-XX:ValueArrayElemMaxFlatSize=0",
*** 217,227 ****
                  "-XX:ValueArrayElemMaxFlatOops=-1",
                  "-XX:ValueArrayElemMaxFlatSize=-1",
                  "-XX:+ValueArrayFlatten",
                  "-XX:ValueFieldMaxFlatSize=0",
                  "-XX:+ValueTypePassFieldsAsArgs",
!                 "-XX:-ValueTypeReturnedAsFields"};
          }
  
          return null;
      }
  
--- 219,230 ----
                  "-XX:ValueArrayElemMaxFlatOops=-1",
                  "-XX:ValueArrayElemMaxFlatSize=-1",
                  "-XX:+ValueArrayFlatten",
                  "-XX:ValueFieldMaxFlatSize=0",
                  "-XX:+ValueTypePassFieldsAsArgs",
!                 "-XX:-ValueTypeReturnedAsFields",
!                 "-XX:+StressValueTypePassFieldsAsArgs"};
          }
  
          return null;
      }