Limit Jasmin class files to JDK 1.4 or earlier.
Bug:
Change-Id: I1bc41e0054c53c6683e3e64d7b835054da31f936
diff --git a/src/test/java/com/android/tools/r8/jasmin/BooleanByteConfusion.java b/src/test/java/com/android/tools/r8/jasmin/BooleanByteConfusion.java
index 931b58a..561fa9b 100644
--- a/src/test/java/com/android/tools/r8/jasmin/BooleanByteConfusion.java
+++ b/src/test/java/com/android/tools/r8/jasmin/BooleanByteConfusion.java
@@ -21,7 +21,7 @@
@Test
public void booleanByteConfusion() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
// public static void foo(boolean condition) {
diff --git a/src/test/java/com/android/tools/r8/jasmin/DebugLocalTests.java b/src/test/java/com/android/tools/r8/jasmin/DebugLocalTests.java
index a50c831..e572bfa 100644
--- a/src/test/java/com/android/tools/r8/jasmin/DebugLocalTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/DebugLocalTests.java
@@ -171,7 +171,7 @@
// Check that we properly handle switching a local slot from one variable to another.
@Test
public void checkLocalChange() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
MethodSignature foo = clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
@@ -342,7 +342,7 @@
@Test
public void argumentLiveAtReturn() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
/*
@@ -443,7 +443,7 @@
@Test
public void testLocalSwitchRewriteToIfs() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
/*
@@ -541,7 +541,7 @@
@Test
public void testLocalSwitchRewriteToSwitches() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
/*
diff --git a/src/test/java/com/android/tools/r8/jasmin/FillBooleanArrayTruncation.java b/src/test/java/com/android/tools/r8/jasmin/FillBooleanArrayTruncation.java
index 6f9cb79..a38ee9e 100644
--- a/src/test/java/com/android/tools/r8/jasmin/FillBooleanArrayTruncation.java
+++ b/src/test/java/com/android/tools/r8/jasmin/FillBooleanArrayTruncation.java
@@ -45,7 +45,7 @@
@Test
public void filledArray() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
// Corresponds to something like the following (which doesn't compile with javac):
diff --git a/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java b/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java
index 1292846..9394995 100644
--- a/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java
@@ -27,7 +27,7 @@
// will actually be a read of 'x'.
@Test
public void testInvalidInfoThrow() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "V",
@@ -86,7 +86,7 @@
// in this test the scope of "y" (local 2) spans the exceptional edge in which it is not live.
@Test
public void testInvalidInfoBug37722432() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I", "I"), "V",
@@ -219,7 +219,7 @@
@Test
public void invalidInfoBug63412730_onMove() throws Throwable {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
MethodSignature method = clazz.addStaticMethod("bar", ImmutableList.of(), "V",
".limit stack 3",
diff --git a/src/test/java/com/android/tools/r8/jasmin/JasminBuilder.java b/src/test/java/com/android/tools/r8/jasmin/JasminBuilder.java
index ec60d10..964f004 100644
--- a/src/test/java/com/android/tools/r8/jasmin/JasminBuilder.java
+++ b/src/test/java/com/android/tools/r8/jasmin/JasminBuilder.java
@@ -55,36 +55,6 @@
public int getMajorVersion() {
return 48;
}
- },
- JSE_5 {
- @Override
- public int getMajorVersion() {
- return 49;
- }
- },
- JSE_6 {
- @Override
- public int getMajorVersion() {
- return 50;
- }
- },
- JSE_7 {
- @Override
- public int getMajorVersion() {
- return 51;
- }
- },
- JSE_8 {
- @Override
- public int getMajorVersion() {
- return 52;
- }
- },
- JSE_9 {
- @Override
- public int getMajorVersion() {
- return 53;
- }
};
public abstract int getMajorVersion();
@@ -248,7 +218,7 @@
private final int majorVersion;
public JasminBuilder() {
- this(ClassFileVersion.JSE_8);
+ this(ClassFileVersion.JDK_1_4);
}
public JasminBuilder(ClassFileVersion version) {
diff --git a/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineDebugInfoTests.java b/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineDebugInfoTests.java
index 501ad41..9711c88 100644
--- a/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineDebugInfoTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineDebugInfoTests.java
@@ -16,7 +16,7 @@
@Test
public void testJsrWithStraightlineAndDebugInfoCode() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
MethodSignature foo = clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
diff --git a/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java b/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java
index 2db6e33..5e41a25 100644
--- a/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java
@@ -161,7 +161,7 @@
@Test
public void testJsrWithStraightlineCode() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "I",
@@ -193,7 +193,7 @@
@Test
public void testJsrWithStraightlineCodeMultiple() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "I",
@@ -233,7 +233,7 @@
@Test
public void testJsrWithStraightlineCodeMultiple2() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "I",
@@ -279,7 +279,7 @@
@Test
public void testJsrWithControlFlowCode() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -316,7 +316,7 @@
@Test
public void testJsrWithNestedJsr() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -361,7 +361,7 @@
@Test
public void testJsrWithNestedJsrPopReturnAddress() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -393,7 +393,7 @@
@Test
public void testJsrWithNestedPopReturnAddress2() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -419,7 +419,7 @@
@Test
public void testJsrJustThrows() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -451,7 +451,7 @@
@Test
public void testJsrJustThrows2() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -490,7 +490,7 @@
@Test
public void testJsrWithException() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -538,7 +538,7 @@
@Test
public void testJsrWithAddressManipulation() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -574,7 +574,7 @@
@Test
public void testJsrWithSharedExceptionHandler() throws Exception {
// Regression test for b/37659886
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "V",
@@ -616,7 +616,7 @@
@Test
public void regressJsrHitParentCatchHandler() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("test", ImmutableList.of(), "I",
@@ -708,7 +708,7 @@
@Test
public void regressJsrHitParentCatchHandler2() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
generateRegressJsrHitParentCatchHandler2(clazz, "test1", "java/lang/Exception", false);
@@ -735,7 +735,7 @@
// https://github.com/cbeust/testng/blob/4a8459e36f2b0ed057ffa7e470f1057e8e5b0ff9/src/main/java/org/testng/internal/Invoker.java#L1066
// compiled with some ancient version of javac generating code with jsr for try/finally.
public void regress38156139() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("Z"), "I",
@@ -788,7 +788,7 @@
@Test
public void regress37767254() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
// This is the code for the method org.apache.log4j.net.SocketAppender$Connector.run() from
@@ -1351,7 +1351,7 @@
@Test
// This test is based on the example on http://asm.ow2.org/doc/developer-guide.html.
public void testJsrWithNestedRetBasedOnControlFlow2() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("Z"), "I",
@@ -1399,7 +1399,7 @@
@Test
// This test is based on the example on http://asm.ow2.org/doc/developer-guide.html.
public void testJsrWithNestedRetBasedOnControlFlow3() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("Z"), "I",
diff --git a/src/test/java/com/android/tools/r8/jasmin/Regress63598979.java b/src/test/java/com/android/tools/r8/jasmin/Regress63598979.java
index e7c601c..edfaff0 100644
--- a/src/test/java/com/android/tools/r8/jasmin/Regress63598979.java
+++ b/src/test/java/com/android/tools/r8/jasmin/Regress63598979.java
@@ -13,7 +13,7 @@
@Test
public void testSimplifyIf() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("test1", ImmutableList.of("Z"), "Z",
diff --git a/src/test/java/com/android/tools/r8/jasmin/Regress64658224.java b/src/test/java/com/android/tools/r8/jasmin/Regress64658224.java
index 019e5e6..4390d30 100644
--- a/src/test/java/com/android/tools/r8/jasmin/Regress64658224.java
+++ b/src/test/java/com/android/tools/r8/jasmin/Regress64658224.java
@@ -13,7 +13,7 @@
@Test
public void testInvalidTypeInfoFromLocals() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "V",
diff --git a/src/test/java/com/android/tools/r8/jasmin/Regress65432240.java b/src/test/java/com/android/tools/r8/jasmin/Regress65432240.java
index b0a5589..6290e20 100644
--- a/src/test/java/com/android/tools/r8/jasmin/Regress65432240.java
+++ b/src/test/java/com/android/tools/r8/jasmin/Regress65432240.java
@@ -20,7 +20,7 @@
@Test
public void testConstantNotIntoEntryBlock() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
MethodSignature signature = clazz.addStaticMethod("test1", ImmutableList.of("I"), "I",
diff --git a/src/test/java/com/android/tools/r8/jasmin/TryCatchStateTests.java b/src/test/java/com/android/tools/r8/jasmin/TryCatchStateTests.java
index d9bd2c9..ff63ed9 100644
--- a/src/test/java/com/android/tools/r8/jasmin/TryCatchStateTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/TryCatchStateTests.java
@@ -14,7 +14,7 @@
@Test
public void testTryCatchStackHeight() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
@@ -60,7 +60,7 @@
@Test
public void testTryCatchLocals() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
@@ -108,7 +108,7 @@
@Test
public void testTryCatchOnUnreachableLabel() throws Exception {
- JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
