Selectively use older class file format in tests.
Bug:
Change-Id: Id6d66e1a446f3c93c99c6215fe87ecb2e6b1740c
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 c475888..931b58a 100644
--- a/src/test/java/com/android/tools/r8/jasmin/BooleanByteConfusion.java
+++ b/src/test/java/com/android/tools/r8/jasmin/BooleanByteConfusion.java
@@ -5,6 +5,7 @@
import static org.junit.Assert.assertEquals;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
@@ -20,7 +21,7 @@
@Test
public void booleanByteConfusion() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
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 2511d79..a50c831 100644
--- a/src/test/java/com/android/tools/r8/jasmin/DebugLocalTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/DebugLocalTests.java
@@ -9,6 +9,7 @@
import com.android.tools.r8.debuginfo.DebugInfoInspector;
import com.android.tools.r8.graph.DexCode;
import com.android.tools.r8.graph.DexDebugInfo;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.android.tools.r8.naming.MemberNaming.MethodSignature;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.DexInspector;
@@ -170,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();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
MethodSignature foo = clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
@@ -341,7 +342,7 @@
@Test
public void argumentLiveAtReturn() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
/*
@@ -442,7 +443,7 @@
@Test
public void testLocalSwitchRewriteToIfs() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
/*
@@ -540,7 +541,7 @@
@Test
public void testLocalSwitchRewriteToSwitches() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
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 a648381..6f9cb79 100644
--- a/src/test/java/com/android/tools/r8/jasmin/FillBooleanArrayTruncation.java
+++ b/src/test/java/com/android/tools/r8/jasmin/FillBooleanArrayTruncation.java
@@ -7,6 +7,7 @@
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.ToolHelper.DexVm;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
@@ -44,7 +45,7 @@
@Test
public void filledArray() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
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 2551941..1292846 100644
--- a/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java
@@ -9,6 +9,7 @@
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.debuginfo.DebugInfoInspector;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.android.tools.r8.naming.MemberNaming.MethodSignature;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.StringUtils;
@@ -26,7 +27,7 @@
// will actually be a read of 'x'.
@Test
public void testInvalidInfoThrow() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "V",
@@ -85,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();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I", "I"), "V",
@@ -218,7 +219,7 @@
@Test
public void invalidInfoBug63412730_onMove() throws Throwable {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
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 f50d8d6..ec60d10 100644
--- a/src/test/java/com/android/tools/r8/jasmin/JasminBuilder.java
+++ b/src/test/java/com/android/tools/r8/jasmin/JasminBuilder.java
@@ -26,7 +26,75 @@
public class JasminBuilder {
- public static class ClassBuilder {
+ public enum ClassFileVersion {
+ JDK_1_1 {
+ @Override
+ public int getMajorVersion() {
+ return 45;
+ }
+
+ @Override
+ public int getMinorVersion() {
+ return 3;
+ }
+ },
+ JDK_1_2 {
+ @Override
+ public int getMajorVersion() {
+ return 46;
+ }
+ },
+ JDK_1_3 {
+ @Override
+ public int getMajorVersion() {
+ return 47;
+ }
+ },
+ JDK_1_4 {
+ @Override
+ 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();
+
+ public int getMinorVersion() {
+ return 0;
+ }
+ }
+
+ public class ClassBuilder {
public final String name;
public final String superName;
public final ImmutableList<String> interfaces;
@@ -34,10 +102,8 @@
private final List<String> fields = new ArrayList<>();
private boolean makeInit = false;
private boolean isInterface = false;
- private int minorVersion = 0;
- private int majorVersion = 52; // JSE 8
- public ClassBuilder(String name) {
+ private ClassBuilder(String name) {
this(name, "java/lang/Object");
}
@@ -135,10 +201,9 @@
builder.append(".bytecode ").append(majorVersion).append('.').append(minorVersion)
.append('\n');
builder.append(".source ").append(getSourceFile()).append('\n');
+ builder.append(".class");
if (isInterface) {
- builder.append(".interface");
- } else {
- builder.append(".class");
+ builder.append(" interface abstract");
}
builder.append(" public ").append(name).append('\n');
builder.append(".super ").append(superName).append('\n');
@@ -168,11 +233,6 @@
isInterface = true;
}
- void setVersion(int majorVersion, int minorVersion) {
- this.majorVersion = majorVersion;
- this.minorVersion = minorVersion;
- }
-
public MethodSignature addDefaultConstructor() {
return addMethod("public", "<init>", Collections.emptyList(), "V",
".limit stack 1",
@@ -184,8 +244,17 @@
}
private final List<ClassBuilder> classes = new ArrayList<>();
+ private final int minorVersion;
+ private final int majorVersion;
- public JasminBuilder() {}
+ public JasminBuilder() {
+ this(ClassFileVersion.JSE_8);
+ }
+
+ public JasminBuilder(ClassFileVersion version) {
+ majorVersion = version.getMajorVersion();
+ minorVersion = version.getMinorVersion();
+ }
public ClassBuilder addClass(String name) {
ClassBuilder builder = new ClassBuilder(name);
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 f5254fc..501ad41 100644
--- a/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineDebugInfoTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineDebugInfoTests.java
@@ -6,6 +6,7 @@
import static org.junit.Assert.assertEquals;
import com.android.tools.r8.debuginfo.DebugInfoInspector;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.android.tools.r8.naming.MemberNaming.MethodSignature;
import com.android.tools.r8.utils.AndroidApp;
import com.google.common.collect.ImmutableList;
@@ -15,7 +16,7 @@
@Test
public void testJsrWithStraightlineAndDebugInfoCode() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
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 c07f125..2db6e33 100644
--- a/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java
@@ -10,6 +10,7 @@
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.ToolHelper.ProcessResult;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.android.tools.r8.utils.AndroidApp;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
@@ -53,7 +54,7 @@
* }
*/
public void testJsrJava130TryFinally() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_3);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addMainMethod(
@@ -106,7 +107,7 @@
* }
*/
public void testJsrJava130TryFinallyNested() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_3);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addMainMethod(
@@ -160,7 +161,7 @@
@Test
public void testJsrWithStraightlineCode() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "I",
@@ -192,7 +193,7 @@
@Test
public void testJsrWithStraightlineCodeMultiple() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "I",
@@ -232,7 +233,7 @@
@Test
public void testJsrWithStraightlineCodeMultiple2() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "I",
@@ -278,7 +279,7 @@
@Test
public void testJsrWithControlFlowCode() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -315,7 +316,7 @@
@Test
public void testJsrWithNestedJsr() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -360,7 +361,7 @@
@Test
public void testJsrWithNestedJsrPopReturnAddress() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -392,7 +393,7 @@
@Test
public void testJsrWithNestedPopReturnAddress2() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -418,7 +419,7 @@
@Test
public void testJsrJustThrows() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -450,7 +451,7 @@
@Test
public void testJsrJustThrows2() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -489,7 +490,7 @@
@Test
public void testJsrWithException() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -537,7 +538,7 @@
@Test
public void testJsrWithAddressManipulation() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of(), "V",
@@ -573,7 +574,7 @@
@Test
public void testJsrWithSharedExceptionHandler() throws Exception {
// Regression test for b/37659886
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "V",
@@ -615,7 +616,7 @@
@Test
public void regressJsrHitParentCatchHandler() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("test", ImmutableList.of(), "I",
@@ -707,7 +708,7 @@
@Test
public void regressJsrHitParentCatchHandler2() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
generateRegressJsrHitParentCatchHandler2(clazz, "test1", "java/lang/Exception", false);
@@ -734,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();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("Z"), "I",
@@ -787,7 +788,7 @@
@Test
public void regress37767254() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
// This is the code for the method org.apache.log4j.net.SocketAppender$Connector.run() from
@@ -1302,7 +1303,7 @@
@Test
// This test is based on the example on http://asm.ow2.org/doc/developer-guide.html.
public void testJsrWithNestedJsrRetBasedOnControlFlow() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_3);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("Z"), "I",
@@ -1350,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();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("Z"), "I",
@@ -1398,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();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("Z"), "I",
diff --git a/src/test/java/com/android/tools/r8/jasmin/MemberResolutionTest.java b/src/test/java/com/android/tools/r8/jasmin/MemberResolutionTest.java
index 8f32184..15d2a08 100644
--- a/src/test/java/com/android/tools/r8/jasmin/MemberResolutionTest.java
+++ b/src/test/java/com/android/tools/r8/jasmin/MemberResolutionTest.java
@@ -5,6 +5,7 @@
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.jasmin.JasminBuilder.ClassBuilder;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -15,7 +16,7 @@
@Test
public void lookupStaticFieldFromDiamondInterface() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
ClassBuilder interfaceA = builder.addInterface("InterfaceA");
interfaceA.addStaticFinalField("aField", "I", "42");
@@ -39,7 +40,7 @@
@Test
public void lookupStaticFieldFromInterfaceNotSuper() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
ClassBuilder superClass = builder.addClass("SuperClass");
superClass.addStaticFinalField("aField", "I", "42");
@@ -63,7 +64,7 @@
@Test
public void lookupStaticFieldFromSupersInterfaceNotSupersSuper() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JDK_1_4);
ClassBuilder superSuperClass = builder.addClass("SuperSuperClass");
superSuperClass.addStaticFinalField("aField", "I", "123");
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 091a43a..e7c601c 100644
--- a/src/test/java/com/android/tools/r8/jasmin/Regress63598979.java
+++ b/src/test/java/com/android/tools/r8/jasmin/Regress63598979.java
@@ -5,6 +5,7 @@
import static org.junit.Assert.assertEquals;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
@@ -12,7 +13,7 @@
@Test
public void testSimplifyIf() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
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 8c1df56..019e5e6 100644
--- a/src/test/java/com/android/tools/r8/jasmin/Regress64658224.java
+++ b/src/test/java/com/android/tools/r8/jasmin/Regress64658224.java
@@ -5,6 +5,7 @@
import static org.junit.Assert.assertEquals;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
@@ -12,7 +13,7 @@
@Test
public void testInvalidTypeInfoFromLocals() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
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 df0d6e2..b0a5589 100644
--- a/src/test/java/com/android/tools/r8/jasmin/Regress65432240.java
+++ b/src/test/java/com/android/tools/r8/jasmin/Regress65432240.java
@@ -10,6 +10,7 @@
import com.android.tools.r8.code.IfNez;
import com.android.tools.r8.graph.DexCode;
import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.android.tools.r8.naming.MemberNaming.MethodSignature;
import com.android.tools.r8.utils.AndroidApp;
import com.google.common.collect.ImmutableList;
@@ -19,7 +20,7 @@
@Test
public void testConstantNotIntoEntryBlock() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
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 39c2f50..d9bd2c9 100644
--- a/src/test/java/com/android/tools/r8/jasmin/TryCatchStateTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/TryCatchStateTests.java
@@ -6,6 +6,7 @@
import static org.junit.Assert.assertEquals;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.jasmin.JasminBuilder.ClassFileVersion;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
@@ -13,7 +14,7 @@
@Test
public void testTryCatchStackHeight() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
@@ -59,7 +60,7 @@
@Test
public void testTryCatchLocals() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
@@ -107,7 +108,7 @@
@Test
public void testTryCatchOnUnreachableLabel() throws Exception {
- JasminBuilder builder = new JasminBuilder();
+ JasminBuilder builder = new JasminBuilder(ClassFileVersion.JSE_6);
JasminBuilder.ClassBuilder clazz = builder.addClass("Test");
clazz.addStaticMethod("foo", ImmutableList.of("I"), "I",
