ART: Print C1vis lists as [v1,...,vN]
Checker interprets whitespace as a don't-care placeholder, making it
easier to write assertions which test only parts of the output (e.g.
"//CHECK: Add liveness:44" does not test the inputs or any other
attributes apart from "liveness").
However, since the GraphVisualizer prints lists with elements
separated by spaces ("[ v1 ... vN ]"), this allows for false positives
caused by an occurrence elsewhere in the output. For example, the
assertion: "//CHECK: [ x y ]" will match "[ x y ]" but also
"[ x a y b ]" or even "[ x ] abc [ y ]".
Switching to comma-separated lists works around this issue.
This patch updates all test files, fixes one false positive that this
change revealed (test 442, line 337) and two occurrences of a wrong
match (test 462, lines 121, 149).
Bug: 21189305
Change-Id: I3b22503be3d92529dac0b13f66bccbcfabea6721
diff --git a/test/442-checker-constant-folding/src/Main.java b/test/442-checker-constant-folding/src/Main.java
index 9a2e4fc..c258db9 100644
--- a/test/442-checker-constant-folding/src/Main.java
+++ b/test/442-checker-constant-folding/src/Main.java
@@ -53,12 +53,12 @@
// CHECK-START: int Main.IntNegation() constant_folding (before)
// CHECK-DAG: <<Const42:i\d+>> IntConstant 42
- // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Const42>> ]
- // CHECK-DAG: Return [ <<Neg>> ]
+ // CHECK-DAG: <<Neg:i\d+>> Neg [<<Const42>>]
+ // CHECK-DAG: Return [<<Neg>>]
// CHECK-START: int Main.IntNegation() constant_folding (after)
// CHECK-DAG: <<ConstN42:i\d+>> IntConstant -42
- // CHECK-DAG: Return [ <<ConstN42>> ]
+ // CHECK-DAG: Return [<<ConstN42>>]
public static int IntNegation() {
int x, y;
@@ -75,12 +75,12 @@
// CHECK-START: int Main.IntAddition1() constant_folding (before)
// CHECK-DAG: <<Const1:i\d+>> IntConstant 1
// CHECK-DAG: <<Const2:i\d+>> IntConstant 2
- // CHECK-DAG: <<Add:i\d+>> Add [ <<Const1>> <<Const2>> ]
- // CHECK-DAG: Return [ <<Add>> ]
+ // CHECK-DAG: <<Add:i\d+>> Add [<<Const1>>,<<Const2>>]
+ // CHECK-DAG: Return [<<Add>>]
// CHECK-START: int Main.IntAddition1() constant_folding (after)
// CHECK-DAG: <<Const3:i\d+>> IntConstant 3
- // CHECK-DAG: Return [ <<Const3>> ]
+ // CHECK-DAG: Return [<<Const3>>]
public static int IntAddition1() {
int a, b, c;
@@ -100,14 +100,14 @@
// CHECK-DAG: <<Const2:i\d+>> IntConstant 2
// CHECK-DAG: <<Const5:i\d+>> IntConstant 5
// CHECK-DAG: <<Const6:i\d+>> IntConstant 6
- // CHECK-DAG: <<Add1:i\d+>> Add [ <<Const1>> <<Const2>> ]
- // CHECK-DAG: <<Add2:i\d+>> Add [ <<Const5>> <<Const6>> ]
- // CHECK-DAG: <<Add3:i\d+>> Add [ <<Add1>> <<Add2>> ]
- // CHECK-DAG: Return [ <<Add3>> ]
+ // CHECK-DAG: <<Add1:i\d+>> Add [<<Const1>>,<<Const2>>]
+ // CHECK-DAG: <<Add2:i\d+>> Add [<<Const5>>,<<Const6>>]
+ // CHECK-DAG: <<Add3:i\d+>> Add [<<Add1>>,<<Add2>>]
+ // CHECK-DAG: Return [<<Add3>>]
// CHECK-START: int Main.IntAddition2() constant_folding (after)
// CHECK-DAG: <<Const14:i\d+>> IntConstant 14
- // CHECK-DAG: Return [ <<Const14>> ]
+ // CHECK-DAG: Return [<<Const14>>]
public static int IntAddition2() {
int a, b, c;
@@ -129,12 +129,12 @@
// CHECK-START: int Main.IntSubtraction() constant_folding (before)
// CHECK-DAG: <<Const6:i\d+>> IntConstant 6
// CHECK-DAG: <<Const2:i\d+>> IntConstant 2
- // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Const6>> <<Const2>> ]
- // CHECK-DAG: Return [ <<Sub>> ]
+ // CHECK-DAG: <<Sub:i\d+>> Sub [<<Const6>>,<<Const2>>]
+ // CHECK-DAG: Return [<<Sub>>]
// CHECK-START: int Main.IntSubtraction() constant_folding (after)
// CHECK-DAG: <<Const4:i\d+>> IntConstant 4
- // CHECK-DAG: Return [ <<Const4>> ]
+ // CHECK-DAG: Return [<<Const4>>]
public static int IntSubtraction() {
int a, b, c;
@@ -152,12 +152,12 @@
// CHECK-START: long Main.LongAddition() constant_folding (before)
// CHECK-DAG: <<Const1:j\d+>> LongConstant 1
// CHECK-DAG: <<Const2:j\d+>> LongConstant 2
- // CHECK-DAG: <<Add:j\d+>> Add [ <<Const1>> <<Const2>> ]
- // CHECK-DAG: Return [ <<Add>> ]
+ // CHECK-DAG: <<Add:j\d+>> Add [<<Const1>>,<<Const2>>]
+ // CHECK-DAG: Return [<<Add>>]
// CHECK-START: long Main.LongAddition() constant_folding (after)
// CHECK-DAG: <<Const3:j\d+>> LongConstant 3
- // CHECK-DAG: Return [ <<Const3>> ]
+ // CHECK-DAG: Return [<<Const3>>]
public static long LongAddition() {
long a, b, c;
@@ -175,12 +175,12 @@
// CHECK-START: long Main.LongSubtraction() constant_folding (before)
// CHECK-DAG: <<Const6:j\d+>> LongConstant 6
// CHECK-DAG: <<Const2:j\d+>> LongConstant 2
- // CHECK-DAG: <<Sub:j\d+>> Sub [ <<Const6>> <<Const2>> ]
- // CHECK-DAG: Return [ <<Sub>> ]
+ // CHECK-DAG: <<Sub:j\d+>> Sub [<<Const6>>,<<Const2>>]
+ // CHECK-DAG: Return [<<Sub>>]
// CHECK-START: long Main.LongSubtraction() constant_folding (after)
// CHECK-DAG: <<Const4:j\d+>> LongConstant 4
- // CHECK-DAG: Return [ <<Const4>> ]
+ // CHECK-DAG: Return [<<Const4>>]
public static long LongSubtraction() {
long a, b, c;
@@ -197,12 +197,12 @@
// CHECK-START: int Main.StaticCondition() constant_folding (before)
// CHECK-DAG: <<Const7:i\d+>> IntConstant 7
// CHECK-DAG: <<Const2:i\d+>> IntConstant 2
- // CHECK-DAG: <<Cond:z\d+>> GreaterThanOrEqual [ <<Const7>> <<Const2>> ]
- // CHECK-DAG: If [ <<Cond>> ]
+ // CHECK-DAG: <<Cond:z\d+>> GreaterThanOrEqual [<<Const7>>,<<Const2>>]
+ // CHECK-DAG: If [<<Cond>>]
// CHECK-START: int Main.StaticCondition() constant_folding (after)
// CHECK-DAG: <<Const1:i\d+>> IntConstant 1
- // CHECK-DAG: If [ <<Const1>> ]
+ // CHECK-DAG: If [<<Const1>>]
public static int StaticCondition() {
int a, b, c;
@@ -227,16 +227,16 @@
// CHECK-START: int Main.JumpsAndConditionals(boolean) constant_folding (before)
// CHECK-DAG: <<Const2:i\d+>> IntConstant 2
// CHECK-DAG: <<Const5:i\d+>> IntConstant 5
- // CHECK-DAG: <<Add:i\d+>> Add [ <<Const5>> <<Const2>> ]
- // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Const5>> <<Const2>> ]
- // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Add>> <<Sub>> ]
- // CHECK-DAG: Return [ <<Phi>> ]
+ // CHECK-DAG: <<Add:i\d+>> Add [<<Const5>>,<<Const2>>]
+ // CHECK-DAG: <<Sub:i\d+>> Sub [<<Const5>>,<<Const2>>]
+ // CHECK-DAG: <<Phi:i\d+>> Phi [<<Add>>,<<Sub>>]
+ // CHECK-DAG: Return [<<Phi>>]
// CHECK-START: int Main.JumpsAndConditionals(boolean) constant_folding (after)
// CHECK-DAG: <<Const3:i\d+>> IntConstant 3
// CHECK-DAG: <<Const7:i\d+>> IntConstant 7
- // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Const7>> <<Const3>> ]
- // CHECK-DAG: Return [ <<Phi>> ]
+ // CHECK-DAG: <<Phi:i\d+>> Phi [<<Const7>>,<<Const3>>]
+ // CHECK-DAG: Return [<<Phi>>]
public static int JumpsAndConditionals(boolean cond) {
int a, b, c;
@@ -256,14 +256,14 @@
// CHECK-START: int Main.And0(int) constant_folding (before)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
- // CHECK-DAG: <<And:i\d+>> And [ <<Arg>> <<Const0>> ]
- // CHECK-DAG: Return [ <<And>> ]
+ // CHECK-DAG: <<And:i\d+>> And [<<Arg>>,<<Const0>>]
+ // CHECK-DAG: Return [<<And>>]
// CHECK-START: int Main.And0(int) constant_folding (after)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
// CHECK-NOT: And
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static int And0(int arg) {
return arg & 0;
@@ -272,14 +272,14 @@
// CHECK-START: long Main.Mul0(long) constant_folding (before)
// CHECK-DAG: <<Arg:j\d+>> ParameterValue
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
- // CHECK-DAG: <<Mul:j\d+>> Mul [ <<Arg>> <<Const0>> ]
- // CHECK-DAG: Return [ <<Mul>> ]
+ // CHECK-DAG: <<Mul:j\d+>> Mul [<<Arg>>,<<Const0>>]
+ // CHECK-DAG: Return [<<Mul>>]
// CHECK-START: long Main.Mul0(long) constant_folding (after)
// CHECK-DAG: <<Arg:j\d+>> ParameterValue
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
// CHECK-NOT: Mul
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static long Mul0(long arg) {
return arg * 0;
@@ -288,13 +288,13 @@
// CHECK-START: int Main.OrAllOnes(int) constant_folding (before)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<ConstF:i\d+>> IntConstant -1
- // CHECK-DAG: <<Or:i\d+>> Or [ <<Arg>> <<ConstF>> ]
- // CHECK-DAG: Return [ <<Or>> ]
+ // CHECK-DAG: <<Or:i\d+>> Or [<<Arg>>,<<ConstF>>]
+ // CHECK-DAG: Return [<<Or>>]
// CHECK-START: int Main.OrAllOnes(int) constant_folding (after)
// CHECK-DAG: <<ConstF:i\d+>> IntConstant -1
// CHECK-NOT: Or
- // CHECK-DAG: Return [ <<ConstF>> ]
+ // CHECK-DAG: Return [<<ConstF>>]
public static int OrAllOnes(int arg) {
return arg | -1;
@@ -303,14 +303,14 @@
// CHECK-START: long Main.Rem0(long) constant_folding (before)
// CHECK-DAG: <<Arg:j\d+>> ParameterValue
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
- // CHECK-DAG: <<DivZeroCheck:j\d+>> DivZeroCheck [ <<Arg>> ]
- // CHECK-DAG: <<Rem:j\d+>> Rem [ <<Const0>> <<DivZeroCheck>> ]
- // CHECK-DAG: Return [ <<Rem>> ]
+ // CHECK-DAG: <<DivZeroCheck:j\d+>> DivZeroCheck [<<Arg>>]
+ // CHECK-DAG: <<Rem:j\d+>> Rem [<<Const0>>,<<DivZeroCheck>>]
+ // CHECK-DAG: Return [<<Rem>>]
// CHECK-START: long Main.Rem0(long) constant_folding (after)
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
// CHECK-NOT: Rem
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static long Rem0(long arg) {
return 0 % arg;
@@ -319,13 +319,13 @@
// CHECK-START: int Main.Rem1(int) constant_folding (before)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const1:i\d+>> IntConstant 1
- // CHECK-DAG: <<Rem:i\d+>> Rem [ <<Arg>> <<Const1>> ]
- // CHECK-DAG: Return [ <<Rem>> ]
+ // CHECK-DAG: <<Rem:i\d+>> Rem [<<Arg>>,<<Const1>>]
+ // CHECK-DAG: Return [<<Rem>>]
// CHECK-START: int Main.Rem1(int) constant_folding (after)
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
// CHECK-NOT: Rem
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static int Rem1(int arg) {
return arg % 1;
@@ -334,14 +334,14 @@
// CHECK-START: long Main.RemN1(long) constant_folding (before)
// CHECK-DAG: <<Arg:j\d+>> ParameterValue
// CHECK-DAG: <<ConstN1:j\d+>> LongConstant -1
- // CHECK-DAG: <<DivZeroCheck:j\d+>> DivZeroCheck [ <<Arg>> ]
- // CHECK-DAG: <<Rem:j\d+>> Rem [ <<Arg>> <<DivZeroCheck>> ]
- // CHECK-DAG: Return [ <<Rem>> ]
+ // CHECK-DAG: <<DivZeroCheck:j\d+>> DivZeroCheck [<<ConstN1>>]
+ // CHECK-DAG: <<Rem:j\d+>> Rem [<<Arg>>,<<DivZeroCheck>>]
+ // CHECK-DAG: Return [<<Rem>>]
// CHECK-START: long Main.RemN1(long) constant_folding (after)
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
// CHECK-NOT: Rem
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static long RemN1(long arg) {
return arg % -1;
@@ -350,14 +350,14 @@
// CHECK-START: int Main.Shl0(int) constant_folding (before)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
- // CHECK-DAG: <<Shl:i\d+>> Shl [ <<Const0>> <<Arg>> ]
- // CHECK-DAG: Return [ <<Shl>> ]
+ // CHECK-DAG: <<Shl:i\d+>> Shl [<<Const0>>,<<Arg>>]
+ // CHECK-DAG: Return [<<Shl>>]
// CHECK-START: int Main.Shl0(int) constant_folding (after)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
// CHECK-NOT: Shl
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static int Shl0(int arg) {
return 0 << arg;
@@ -366,14 +366,14 @@
// CHECK-START: long Main.Shr0(int) constant_folding (before)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
- // CHECK-DAG: <<Shr:j\d+>> Shr [ <<Const0>> <<Arg>> ]
- // CHECK-DAG: Return [ <<Shr>> ]
+ // CHECK-DAG: <<Shr:j\d+>> Shr [<<Const0>>,<<Arg>>]
+ // CHECK-DAG: Return [<<Shr>>]
// CHECK-START: long Main.Shr0(int) constant_folding (after)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
// CHECK-NOT: Shr
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static long Shr0(int arg) {
return (long)0 >> arg;
@@ -381,14 +381,14 @@
// CHECK-START: long Main.SubSameLong(long) constant_folding (before)
// CHECK-DAG: <<Arg:j\d+>> ParameterValue
- // CHECK-DAG: <<Sub:j\d+>> Sub [ <<Arg>> <<Arg>> ]
- // CHECK-DAG: Return [ <<Sub>> ]
+ // CHECK-DAG: <<Sub:j\d+>> Sub [<<Arg>>,<<Arg>>]
+ // CHECK-DAG: Return [<<Sub>>]
// CHECK-START: long Main.SubSameLong(long) constant_folding (after)
// CHECK-DAG: <<Arg:j\d+>> ParameterValue
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
// CHECK-NOT: Sub
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static long SubSameLong(long arg) {
return arg - arg;
@@ -397,14 +397,14 @@
// CHECK-START: int Main.UShr0(int) constant_folding (before)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
- // CHECK-DAG: <<UShr:i\d+>> UShr [ <<Const0>> <<Arg>> ]
- // CHECK-DAG: Return [ <<UShr>> ]
+ // CHECK-DAG: <<UShr:i\d+>> UShr [<<Const0>>,<<Arg>>]
+ // CHECK-DAG: Return [<<UShr>>]
// CHECK-START: int Main.UShr0(int) constant_folding (after)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
// CHECK-NOT: UShr
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static int UShr0(int arg) {
return 0 >>> arg;
@@ -412,14 +412,14 @@
// CHECK-START: int Main.XorSameInt(int) constant_folding (before)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
- // CHECK-DAG: <<Xor:i\d+>> Xor [ <<Arg>> <<Arg>> ]
- // CHECK-DAG: Return [ <<Xor>> ]
+ // CHECK-DAG: <<Xor:i\d+>> Xor [<<Arg>>,<<Arg>>]
+ // CHECK-DAG: Return [<<Xor>>]
// CHECK-START: int Main.XorSameInt(int) constant_folding (after)
// CHECK-DAG: <<Arg:i\d+>> ParameterValue
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
// CHECK-NOT: Xor
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static int XorSameInt(int arg) {
return arg ^ arg;
@@ -430,16 +430,16 @@
// CHECK-DAG: <<ConstNan:f\d+>> FloatConstant nan
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
// CHECK-DAG: IntConstant 1
- // CHECK-DAG: <<Cmp:i\d+>> Compare [ <<Arg>> <<ConstNan>> ]
- // CHECK-DAG: <<Le:z\d+>> LessThanOrEqual [ <<Cmp>> <<Const0>> ]
- // CHECK-DAG: If [ <<Le>> ]
+ // CHECK-DAG: <<Cmp:i\d+>> Compare [<<Arg>>,<<ConstNan>>]
+ // CHECK-DAG: <<Le:z\d+>> LessThanOrEqual [<<Cmp>>,<<Const0>>]
+ // CHECK-DAG: If [<<Le>>]
// CHECK-START: boolean Main.CmpFloatGreaterThanNaN(float) constant_folding (after)
// CHECK-DAG: ParameterValue
// CHECK-DAG: FloatConstant nan
// CHECK-DAG: IntConstant 0
// CHECK-DAG: <<Const1:i\d+>> IntConstant 1
- // CHECK-DAG: If [ <<Const1>> ]
+ // CHECK-DAG: If [<<Const1>>]
// CHECK-START: boolean Main.CmpFloatGreaterThanNaN(float) constant_folding (after)
// CHECK-NOT: Compare
@@ -454,16 +454,16 @@
// CHECK-DAG: <<ConstNan:d\d+>> DoubleConstant nan
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
// CHECK-DAG: IntConstant 1
- // CHECK-DAG: <<Cmp:i\d+>> Compare [ <<Arg>> <<ConstNan>> ]
- // CHECK-DAG: <<Ge:z\d+>> GreaterThanOrEqual [ <<Cmp>> <<Const0>> ]
- // CHECK-DAG: If [ <<Ge>> ]
+ // CHECK-DAG: <<Cmp:i\d+>> Compare [<<Arg>>,<<ConstNan>>]
+ // CHECK-DAG: <<Ge:z\d+>> GreaterThanOrEqual [<<Cmp>>,<<Const0>>]
+ // CHECK-DAG: If [<<Ge>>]
// CHECK-START: boolean Main.CmpDoubleLessThanNaN(double) constant_folding (after)
// CHECK-DAG: ParameterValue
// CHECK-DAG: DoubleConstant nan
// CHECK-DAG: IntConstant 0
// CHECK-DAG: <<Const1:i\d+>> IntConstant 1
- // CHECK-DAG: If [ <<Const1>> ]
+ // CHECK-DAG: If [<<Const1>>]
// CHECK-START: boolean Main.CmpDoubleLessThanNaN(double) constant_folding (after)
// CHECK-NOT: Compare
@@ -475,12 +475,12 @@
// CHECK-START: int Main.ReturnInt33() constant_folding (before)
// CHECK-DAG: <<Const33:j\d+>> LongConstant 33
- // CHECK-DAG: <<Convert:i\d+>> TypeConversion <<Const33>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:i\d+>> TypeConversion [<<Const33>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: int Main.ReturnInt33() constant_folding (after)
// CHECK-DAG: <<Const33:i\d+>> IntConstant 33
- // CHECK-DAG: Return [ <<Const33>> ]
+ // CHECK-DAG: Return [<<Const33>>]
public static int ReturnInt33() {
long imm = 33L;
@@ -489,12 +489,12 @@
// CHECK-START: int Main.ReturnIntMax() constant_folding (before)
// CHECK-DAG: <<ConstMax:f\d+>> FloatConstant 1e+34
- // CHECK-DAG: <<Convert:i\d+>> TypeConversion <<ConstMax>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:i\d+>> TypeConversion [<<ConstMax>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: int Main.ReturnIntMax() constant_folding (after)
// CHECK-DAG: <<ConstMax:i\d+>> IntConstant 2147483647
- // CHECK-DAG: Return [ <<ConstMax>> ]
+ // CHECK-DAG: Return [<<ConstMax>>]
public static int ReturnIntMax() {
float imm = 1.0e34f;
@@ -503,12 +503,12 @@
// CHECK-START: int Main.ReturnInt0() constant_folding (before)
// CHECK-DAG: <<ConstNaN:d\d+>> DoubleConstant nan
- // CHECK-DAG: <<Convert:i\d+>> TypeConversion <<ConstNaN>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:i\d+>> TypeConversion [<<ConstNaN>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: int Main.ReturnInt0() constant_folding (after)
// CHECK-DAG: <<Const0:i\d+>> IntConstant 0
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static int ReturnInt0() {
double imm = Double.NaN;
@@ -517,12 +517,12 @@
// CHECK-START: long Main.ReturnLong33() constant_folding (before)
// CHECK-DAG: <<Const33:i\d+>> IntConstant 33
- // CHECK-DAG: <<Convert:j\d+>> TypeConversion <<Const33>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:j\d+>> TypeConversion [<<Const33>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: long Main.ReturnLong33() constant_folding (after)
// CHECK-DAG: <<Const33:j\d+>> LongConstant 33
- // CHECK-DAG: Return [ <<Const33>> ]
+ // CHECK-DAG: Return [<<Const33>>]
public static long ReturnLong33() {
int imm = 33;
@@ -531,12 +531,12 @@
// CHECK-START: long Main.ReturnLong34() constant_folding (before)
// CHECK-DAG: <<Const34:f\d+>> FloatConstant 34
- // CHECK-DAG: <<Convert:j\d+>> TypeConversion <<Const34>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:j\d+>> TypeConversion [<<Const34>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: long Main.ReturnLong34() constant_folding (after)
// CHECK-DAG: <<Const34:j\d+>> LongConstant 34
- // CHECK-DAG: Return [ <<Const34>> ]
+ // CHECK-DAG: Return [<<Const34>>]
public static long ReturnLong34() {
float imm = 34.0f;
@@ -545,12 +545,12 @@
// CHECK-START: long Main.ReturnLong0() constant_folding (before)
// CHECK-DAG: <<ConstNaN:d\d+>> DoubleConstant nan
- // CHECK-DAG: <<Convert:j\d+>> TypeConversion <<ConstNaN>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:j\d+>> TypeConversion [<<ConstNaN>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: long Main.ReturnLong0() constant_folding (after)
// CHECK-DAG: <<Const0:j\d+>> LongConstant 0
- // CHECK-DAG: Return [ <<Const0>> ]
+ // CHECK-DAG: Return [<<Const0>>]
public static long ReturnLong0() {
double imm = -Double.NaN;
@@ -559,12 +559,12 @@
// CHECK-START: float Main.ReturnFloat33() constant_folding (before)
// CHECK-DAG: <<Const33:i\d+>> IntConstant 33
- // CHECK-DAG: <<Convert:f\d+>> TypeConversion <<Const33>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:f\d+>> TypeConversion [<<Const33>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: float Main.ReturnFloat33() constant_folding (after)
// CHECK-DAG: <<Const33:f\d+>> FloatConstant 33
- // CHECK-DAG: Return [ <<Const33>> ]
+ // CHECK-DAG: Return [<<Const33>>]
public static float ReturnFloat33() {
int imm = 33;
@@ -573,12 +573,12 @@
// CHECK-START: float Main.ReturnFloat34() constant_folding (before)
// CHECK-DAG: <<Const34:j\d+>> LongConstant 34
- // CHECK-DAG: <<Convert:f\d+>> TypeConversion <<Const34>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:f\d+>> TypeConversion [<<Const34>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: float Main.ReturnFloat34() constant_folding (after)
// CHECK-DAG: <<Const34:f\d+>> FloatConstant 34
- // CHECK-DAG: Return [ <<Const34>> ]
+ // CHECK-DAG: Return [<<Const34>>]
public static float ReturnFloat34() {
long imm = 34L;
@@ -587,12 +587,12 @@
// CHECK-START: float Main.ReturnFloat99P25() constant_folding (before)
// CHECK-DAG: <<Const:d\d+>> DoubleConstant 99.25
- // CHECK-DAG: <<Convert:f\d+>> TypeConversion <<Const>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:f\d+>> TypeConversion [<<Const>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: float Main.ReturnFloat99P25() constant_folding (after)
// CHECK-DAG: <<Const:f\d+>> FloatConstant 99.25
- // CHECK-DAG: Return [ <<Const>> ]
+ // CHECK-DAG: Return [<<Const>>]
public static float ReturnFloat99P25() {
double imm = 99.25;
@@ -601,12 +601,12 @@
// CHECK-START: double Main.ReturnDouble33() constant_folding (before)
// CHECK-DAG: <<Const33:i\d+>> IntConstant 33
- // CHECK-DAG: <<Convert:d\d+>> TypeConversion <<Const33>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:d\d+>> TypeConversion [<<Const33>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: double Main.ReturnDouble33() constant_folding (after)
// CHECK-DAG: <<Const33:d\d+>> DoubleConstant 33
- // CHECK-DAG: Return [ <<Const33>> ]
+ // CHECK-DAG: Return [<<Const33>>]
public static double ReturnDouble33() {
int imm = 33;
@@ -615,12 +615,12 @@
// CHECK-START: double Main.ReturnDouble34() constant_folding (before)
// CHECK-DAG: <<Const34:j\d+>> LongConstant 34
- // CHECK-DAG: <<Convert:d\d+>> TypeConversion <<Const34>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:d\d+>> TypeConversion [<<Const34>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: double Main.ReturnDouble34() constant_folding (after)
// CHECK-DAG: <<Const34:d\d+>> DoubleConstant 34
- // CHECK-DAG: Return [ <<Const34>> ]
+ // CHECK-DAG: Return [<<Const34>>]
public static double ReturnDouble34() {
long imm = 34L;
@@ -629,12 +629,12 @@
// CHECK-START: double Main.ReturnDouble99P25() constant_folding (before)
// CHECK-DAG: <<Const:f\d+>> FloatConstant 99.25
- // CHECK-DAG: <<Convert:d\d+>> TypeConversion <<Const>>
- // CHECK-DAG: Return [ <<Convert>> ]
+ // CHECK-DAG: <<Convert:d\d+>> TypeConversion [<<Const>>]
+ // CHECK-DAG: Return [<<Convert>>]
// CHECK-START: double Main.ReturnDouble99P25() constant_folding (after)
// CHECK-DAG: <<Const:d\d+>> DoubleConstant 99.25
- // CHECK-DAG: Return [ <<Const>> ]
+ // CHECK-DAG: Return [<<Const>>]
public static double ReturnDouble99P25() {
float imm = 99.25f;