Skip to content

Commit

Permalink
fix tests for bytecode frontend changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Timbals
Timbals committed Nov 4, 2023
1 parent 4636dad commit ad15006
Show file tree
Hide file tree
Showing 27 changed files with 459 additions and 524 deletions.
10 changes: 4 additions & 6 deletions ...ytecode/src/test/java/sootup/java/bytecode/minimaltestsuite/java10/TypeInferenceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,10 @@ public List<String> expectedBodyStmts() {
"specialinvoke $stack6.<java.io.BufferedReader: void <init>(java.io.Reader)>(l3)",
"l4 = $stack6",
"label1:",
"$stack9 = l4",
"$stack7 = virtualinvoke $stack9.<java.io.BufferedReader: java.lang.String readLine()>()",
"l2 = $stack7",
"if $stack7 == null goto label2",
"$stack8 = <java.lang.System: java.io.PrintStream out>",
"virtualinvoke $stack8.<java.io.PrintStream: void println(java.lang.String)>(l2)",
"l2 = virtualinvoke l4.<java.io.BufferedReader: java.lang.String readLine()>()",
"if l2 == null goto label2",
"$stack7 = <java.lang.System: java.io.PrintStream out>",
"virtualinvoke $stack7.<java.io.PrintStream: void println(java.lang.String)>(l2)",
"goto label1",
"label2:",
"virtualinvoke l4.<java.io.BufferedReader: void close()>()",
Expand Down
43 changes: 21 additions & 22 deletions ...e/src/test/java/sootup/java/bytecode/minimaltestsuite/java14/SwitchExprWithYieldTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ public MethodSignature getMethodSignature() {
* }
* };
*
* switch (k) {
* case 1:
* s += "single";
* default:
* s += "somethingElse";
* };
*
* System.out.println(s);
* }
* </pre>
Expand All @@ -80,59 +87,51 @@ public List<String> expectedBodyStmts() {
"case 3: goto label02",
"default: goto label03",
"label01:",
"$stack11 = \"single\"",
"l2 = \"single\"",
"goto label04",
"label02:",
"$stack11 = \"double\"",
"l2 = \"double\"",
"goto label04",
"label03:",
"$stack11 = \"somethingElse\"",
"l2 = \"somethingElse\"",
"label04:",
"l2 = $stack11",
"$stack12 = l1",
"switch($stack12)",
"switch(l1)",
"case 1: goto label05",
"case 2: goto label06",
"case 3: goto label06",
"default: goto label07",
"label05:",
"$stack9 = \"single\"",
"l2 = \"single\"",
"goto label08",
"label06:",
"$stack9 = \"double\"",
"l2 = \"double\"",
"goto label08",
"label07:",
"$stack9 = \"somethingElse\"",
"l2 = \"somethingElse\"",
"label08:",
"l2 = $stack9",
"$stack10 = l1",
"switch($stack10)",
"switch(l1)",
"case 1: goto label09",
"case 2: goto label10",
"case 3: goto label10",
"default: goto label11",
"label09:",
"$stack7 = \"no fall through\"",
"l2 = \"no fall through\"",
"goto label12",
"label10:",
"$stack7 = \"still no fall through\"",
"l2 = \"still no fall through\"",
"goto label12",
"label11:",
"$stack7 = \"we will not fall through\"",
"l2 = \"we will not fall through\"",
"label12:",
"l2 = $stack7",
"$stack8 = l1",
"switch($stack8)",
"switch(l1)",
"case 1: goto label13",
"default: goto label14",
"label13:",
"l2 = dynamicinvoke \"makeConcatWithConstants\" <java.lang.String (java.lang.String)>(l2) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>(\"\\u0001single\")",
"label14:",
"$stack4 = l2",
"$stack5 = dynamicinvoke \"makeConcatWithConstants\" <java.lang.String (java.lang.String)>(l2) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>(\"\\u0001somethingElse\")",
"l2 = dynamicinvoke \"makeConcatWithConstants\" <java.lang.String (java.lang.String)>(l2) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>(\"\\u0001somethingElse\")",
"$stack3 = <java.lang.System: java.io.PrintStream out>",
"$stack6 = l2",
"virtualinvoke $stack3.<java.io.PrintStream: void println(java.lang.String)>($stack6)",
"virtualinvoke $stack3.<java.io.PrintStream: void println(java.lang.String)>(l2)",
"return")
.collect(Collectors.toCollection(ArrayList::new));
}
Expand Down
36 changes: 9 additions & 27 deletions ....bytecode/src/test/java/sootup/java/bytecode/minimaltestsuite/java6/AccessArraysTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ public List<String> expectedBodyStmtsIntArrays() {
"l4 = lengthof l3",
"l5 = 0",
"label1:",
"$stack9 = l5",
"$stack8 = l4",
"if $stack9 >= $stack8 goto label2",
"if l5 >= l4 goto label2",
"l6 = l3[l5]",
"l2 = l6",
"l5 = l5 + 1",
Expand Down Expand Up @@ -114,9 +112,7 @@ public List<String> expectedBodyStmtsByteArrays() {
"l4 = lengthof l3",
"l5 = 0",
"label1:",
"$stack9 = l5",
"$stack8 = l4",
"if $stack9 >= $stack8 goto label2",
"if l5 >= l4 goto label2",
"l6 = l3[l5]",
"l2 = l6",
"l5 = l5 + 1",
Expand Down Expand Up @@ -152,9 +148,7 @@ public List<String> expectedBodyStmtsShortArrays() {
"l4 = lengthof l3",
"l5 = 0",
"label1:",
"$stack9 = l5",
"$stack8 = l4",
"if $stack9 >= $stack8 goto label2",
"if l5 >= l4 goto label2",
"l6 = l3[l5]",
"l2 = l6",
"l5 = l5 + 1",
Expand Down Expand Up @@ -190,9 +184,7 @@ public List<String> expectedBodyStmtsLongArrays() {
"l5 = lengthof l4",
"l6 = 0",
"label1:",
"$stack11 = l6",
"$stack10 = l5",
"if $stack11 >= $stack10 goto label2",
"if l6 >= l5 goto label2",
"l7 = l4[l6]",
"l2 = l7",
"l6 = l6 + 1",
Expand Down Expand Up @@ -229,9 +221,7 @@ public List<String> expectedBodyStmtsFloatArrays() {
"l4 = lengthof l3",
"l5 = 0",
"label1:",
"$stack9 = l5",
"$stack8 = l4",
"if $stack9 >= $stack8 goto label2",
"if l5 >= l4 goto label2",
"l6 = l3[l5]",
"l2 = l6",
"l5 = l5 + 1",
Expand Down Expand Up @@ -267,9 +257,7 @@ public List<String> expectedBodyStmtsDoubleArrays() {
"l5 = lengthof l4",
"l6 = 0",
"label1:",
"$stack11 = l6",
"$stack10 = l5",
"if $stack11 >= $stack10 goto label2",
"if l6 >= l5 goto label2",
"l7 = l4[l6]",
"l2 = l7",
"l6 = l6 + 1",
Expand Down Expand Up @@ -304,9 +292,7 @@ public List<String> expectedBodyStmtsBooleanArrays() {
"l4 = lengthof l3",
"l5 = 0",
"label1:",
"$stack9 = l5",
"$stack8 = l4",
"if $stack9 >= $stack8 goto label2",
"if l5 >= l4 goto label2",
"l6 = l3[l5]",
"l2 = l6",
"l5 = l5 + 1",
Expand Down Expand Up @@ -342,9 +328,7 @@ public List<String> expectedBodyStmtsCharArrays() {
"l4 = lengthof l3",
"l5 = 0",
"label1:",
"$stack9 = l5",
"$stack8 = l4",
"if $stack9 >= $stack8 goto label2",
"if l5 >= l4 goto label2",
"l6 = l3[l5]",
"l2 = l6",
"l5 = l5 + 1",
Expand Down Expand Up @@ -378,9 +362,7 @@ public List<String> expectedBodyStmtsStringArrays() {
"l4 = lengthof l3",
"l5 = 0",
"label1:",
"$stack9 = l5",
"$stack8 = l4",
"if $stack9 >= $stack8 goto label2",
"if l5 >= l4 goto label2",
"l6 = l3[l5]",
"l2 = l6",
"l5 = l5 + 1",
Expand Down
27 changes: 12 additions & 15 deletions ...tecode/src/test/java/sootup/java/bytecode/minimaltestsuite/java6/AssertStatementTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,11 @@ public List<String> expectedBodyStmtsExtend() {
"$stack2 = <AssertStatement: boolean $assertionsDisabled>",
"if $stack2 != 0 goto label1",
"if \"\" != null goto label1",
"$stack4 = new java.lang.AssertionError",
"specialinvoke $stack4.<java.lang.AssertionError: void <init>()>()",
"throw $stack4",
"$stack3 = new java.lang.AssertionError",
"specialinvoke $stack3.<java.lang.AssertionError: void <init>()>()",
"throw $stack3",
"label1:",
"$stack3 = 4",
"l1 = $stack3",
"l1 = 4",
"return")
.collect(Collectors.toList());
}
Expand All @@ -98,21 +97,19 @@ public List<String> expectedBodyStmtsExtend2() {
"$stack2 = <AssertStatement: boolean $assertionsDisabled>",
"if $stack2 != 0 goto label1",
"if \"first\" != null goto label1",
"$stack7 = new java.lang.AssertionError",
"specialinvoke $stack7.<java.lang.AssertionError: void <init>()>()",
"throw $stack7",
"$stack5 = new java.lang.AssertionError",
"specialinvoke $stack5.<java.lang.AssertionError: void <init>()>()",
"throw $stack5",
"label1:",
"$stack6 = 1",
"l1 = $stack6",
"l1 = 1",
"$stack3 = <AssertStatement: boolean $assertionsDisabled>",
"if $stack3 != 0 goto label2",
"if \"second\" != null goto label2",
"$stack5 = new java.lang.AssertionError",
"specialinvoke $stack5.<java.lang.AssertionError: void <init>()>()",
"throw $stack5",
"$stack4 = new java.lang.AssertionError",
"specialinvoke $stack4.<java.lang.AssertionError: void <init>()>()",
"throw $stack4",
"label2:",
"$stack4 = 2",
"l1 = $stack4",
"l1 = 2",
"return")
.collect(Collectors.toList());
}
Expand Down
Loading

0 comments on commit ad15006

Please sign in to comment.