Remove dx based debugger tests
Bug: 185205222
Change-Id: I8a4739e71f1e0dc6976b6d13dc85dc27d9f72dd7
diff --git a/build.gradle b/build.gradle
index ce0bc7f..bcc61c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1185,42 +1185,6 @@
dependsOn buildR8ApiUsageSample
}
-task buildDebugInfoExamplesDex {
- def examplesDir = file("src/test/java")
- def hostJar = "debuginfo_examples.jar"
- def hostDexJar = "debuginfo_examples_dex.jar"
- task "compile_debuginfo_examples"(type: JavaCompile) {
- source = fileTree(dir: examplesDir, include: "com/android/tools/r8/debuginfo/*Test.java")
- destinationDir = file("build/test/debuginfo_examples/classes")
- classpath = sourceSets.main.compileClasspath
- sourceCompatibility = JavaVersion.VERSION_1_7
- targetCompatibility = JavaVersion.VERSION_1_7
- options.compilerArgs += ["-Xlint:-options"]
- }
- task "jar_debuginfo_examples"(type: Jar, dependsOn: "compile_debuginfo_examples") {
- archiveName = hostJar
- destinationDir = file("build/test/")
- from "build/test/debuginfo_examples/classes"
- include "**/*.class"
- }
- task "dex_debuginfo_examples"(type: Exec,
- dependsOn: ["jar_debuginfo_examples", "downloadDeps"]) {
- if (OperatingSystem.current().isWindows()) {
- executable file("tools/windows/dx/bin/dx.bat")
- } else if (OperatingSystem.current().isMacOsX()) {
- executable file("tools/mac/dx/bin/dx");
- } else {
- executable file("tools/linux/dx/bin/dx");
- }
- args "--dex"
- args "--output=build/test/${hostDexJar}"
- args "build/test/${hostJar}"
- inputs.files files("build/test/${hostJar}")
- outputs.file file("build/test/${hostDexJar}")
- }
- dependsOn dex_debuginfo_examples
-}
-
task buildDebugTestResourcesJars {
def resourcesDir = file("src/test/debugTestResources")
def hostJar = "debug_test_resources.jar"
@@ -2379,7 +2343,6 @@
dependsOn buildSmali
dependsOn jctfCommonJar
dependsOn jctfTestsClasses
- dependsOn buildDebugInfoExamplesDex
dependsOn buildPreNJdwpTestsJar
dependsOn buildPreNJdwpTestsDex
dependsOn compileTestNGRunner
diff --git a/src/test/java/com/android/tools/r8/debuginfo/ArgumentLocalsInLoopTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/ArgumentLocalsInLoopTestRunner.java
index 250bf86..b4de89d 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/ArgumentLocalsInLoopTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/ArgumentLocalsInLoopTestRunner.java
@@ -14,15 +14,12 @@
public void testArgumentLocalsInLoop() throws Exception {
Class clazz = ArgumentLocalsInLoopTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "0";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
checkFoo(inspectMethod(d8App, clazz, "int", "foo", "int"), clazz);
- checkFoo(inspectMethod(dxApp, clazz, "int", "foo", "int"), clazz);
}
private void checkFoo(DebugInfoInspector info, Class clazz) {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/BackBranchToSelfTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/BackBranchToSelfTestRunner.java
index 0ad8ecd..6b84390 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/BackBranchToSelfTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/BackBranchToSelfTestRunner.java
@@ -15,15 +15,12 @@
Class clazz = BackBranchToSelfTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "42";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
checkBackBranchToSelf(inspectMethod(d8App, clazz, "int", "backBranchToSelf", "boolean"));
- checkBackBranchToSelf(inspectMethod(dxApp, clazz, "int", "backBranchToSelf", "boolean"));
}
private void checkBackBranchToSelf(DebugInfoInspector info) {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/CodeGeneratorTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/CodeGeneratorTestRunner.java
index 062a4d3..1f6520e 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/CodeGeneratorTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/CodeGeneratorTestRunner.java
@@ -24,12 +24,10 @@
Class clazz = CodeGeneratorTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "11";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
DebugInfoInspector inspector = inspectMethod(d8App, clazz, "int", "intAddition", "int", "int",
"int");
diff --git a/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTestRunner.java
index 8348c0b..07fd195 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/ConditionalLocalTestRunner.java
@@ -15,15 +15,12 @@
Class clazz = ConditionalLocalTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "42";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
checkConditonalLocal(inspectMethod(d8App, clazz, "void", "foo", "int"));
- checkConditonalLocal(inspectMethod(dxApp, clazz, "void", "foo", "int"));
}
private void checkConditonalLocal(DebugInfoInspector info) {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/ConstantFoldingTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/ConstantFoldingTestRunner.java
index a229add..6184b2d 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/ConstantFoldingTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/ConstantFoldingTestRunner.java
@@ -14,18 +14,15 @@
public void testLocalsInSwitch() throws Exception {
Class clazz = ConstantFoldingTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "42";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
- checkFoo(inspectMethod(d8App, clazz, "int", "foo", "int"), false);
- checkFoo(inspectMethod(dxApp, clazz, "int", "foo", "int"), true);
+ checkFoo(inspectMethod(d8App, clazz, "int", "foo", "int"));
}
- private void checkFoo(DebugInfoInspector info, boolean dx) {
+ private void checkFoo(DebugInfoInspector info) {
info.checkStartLine(9);
info.checkLineHasExactLocals(9, "x", "int");
info.checkNoLine(10);
@@ -33,10 +30,7 @@
info.checkLineHasExactLocals(12, "x", "int", "res", "int", "tmp", "int");
info.checkNoLine(13);
info.checkLineHasAtLeastLocals(14, "x", "int");
- if (!dx) {
- // DX fails to close the scope of "tmp".
- info.checkLineHasExactLocals(14, "x", "int", "res", "int");
- }
+ info.checkLineHasExactLocals(14, "x", "int", "res", "int");
info.checkNoLine(15);
}
}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/DebugInfoTestBase.java b/src/test/java/com/android/tools/r8/debuginfo/DebugInfoTestBase.java
index da83ed9..09df151 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/DebugInfoTestBase.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/DebugInfoTestBase.java
@@ -26,9 +26,6 @@
public class DebugInfoTestBase {
- public static final Path DX_PREBUILT =
- Paths.get(ToolHelper.BUILD_DIR, "test", "debuginfo_examples_dex.jar");
-
@Rule
public TemporaryFolder temp = ToolHelper.getTemporaryFolderForTest();
@@ -45,10 +42,6 @@
return appSink.build();
}
- static AndroidApp getDxCompiledSources() throws IOException {
- return AndroidApp.builder().addProgramFiles(DX_PREBUILT).build();
- }
-
public static DebugInfoInspector inspectMethod(
AndroidApp app, Class type, String returnType, String methodName, String... parameterTypes)
throws IOException, ExecutionException {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/ExceptionLocalTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/ExceptionLocalTestRunner.java
index 2998c70..f56fb6e 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/ExceptionLocalTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/ExceptionLocalTestRunner.java
@@ -16,15 +16,12 @@
Class clazz = ExceptionLocalTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "2";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
checkExceptionLocal(inspectMethod(d8App, clazz, "void", "foo", "int"));
- checkExceptionLocal(inspectMethod(dxApp, clazz, "void", "foo", "int"));
}
private void checkExceptionLocal(DebugInfoInspector info) {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/LiveInAllBlocksTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/LiveInAllBlocksTestRunner.java
index 01bcb27..0e723f6 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/LiveInAllBlocksTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/LiveInAllBlocksTestRunner.java
@@ -15,24 +15,17 @@
public void testLiveInAllBlocks() throws Exception {
Class clazz = LiveInAllBlocksTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "42";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
- checkFoo(inspectMethod(d8App, clazz, "int", "foo", "int"), false);
- checkFoo(inspectMethod(dxApp, clazz, "int", "foo", "int"), true);
+ checkFoo(inspectMethod(d8App, clazz, "int", "foo", "int"));
}
- private void checkFoo(DebugInfoInspector info, boolean dx) {
+ private void checkFoo(DebugInfoInspector info) {
info.checkStartLine(9);
for (int line : new int[] {14, 18, 23, 24, 25, 27, 28, 30, 31, 34, 35, 37, 38, 40, 41}) {
- if (dx && line == 18) {
- // DX does not keep entry for line 18.
- continue;
- }
info.checkLineHasAtLeastLocals(line, "x", "int", "y", "int");
}
}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/LocalSwapTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/LocalSwapTestRunner.java
index 0ee33bf..12887fe 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/LocalSwapTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/LocalSwapTestRunner.java
@@ -14,27 +14,21 @@
public void testLocalSwap() throws Exception {
Class clazz = LocalSwapTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "6";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
- checkFoo(inspectMethod(d8App, clazz, "int", "foo", "int", "int"), false);
- checkFoo(inspectMethod(dxApp, clazz, "int", "foo", "int", "int"), true);
+ checkFoo(inspectMethod(d8App, clazz, "int", "foo", "int", "int"));
}
- private void checkFoo(DebugInfoInspector info, boolean dx) {
+ private void checkFoo(DebugInfoInspector info) {
info.checkStartLine(9);
info.checkLineHasExactLocals(9, "x", "int", "y", "int");
info.checkLineHasExactLocals(11, "x", "int", "y", "int", "sum", "int");
info.checkLineHasExactLocals(12, "x", "int", "y", "int", "sum", "int", "t", "int");
info.checkLineExists(13);
info.checkLineExists(15);
- if (!dx) {
- // DX fails to close the scope of local "t".
- info.checkLineHasExactLocals(15, "x", "int", "y", "int", "sum", "int");
- }
+ info.checkLineHasExactLocals(15, "x", "int", "y", "int", "sum", "int");
}
}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/LocalsAtThrowTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/LocalsAtThrowTestRunner.java
index 8a5b77d..4be9f50 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/LocalsAtThrowTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/LocalsAtThrowTestRunner.java
@@ -15,15 +15,12 @@
Class clazz = LocalsAtThrowTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "3";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
checkLocalsAtThrow(inspectMethod(d8App, clazz, "int", "localsAtThrow", "int"));
- checkLocalsAtThrow(inspectMethod(dxApp, clazz, "int", "localsAtThrow", "int"));
}
private void checkLocalsAtThrow(DebugInfoInspector info) {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/LocalsInSwitchTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/LocalsInSwitchTestRunner.java
index af726bf..87141f7 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/LocalsInSwitchTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/LocalsInSwitchTestRunner.java
@@ -16,22 +16,17 @@
Class clazz = LocalsInSwitchTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "55" + ToolHelper.LINE_SEPARATOR + "1862" + ToolHelper.LINE_SEPARATOR
+ "15130" + ToolHelper.LINE_SEPARATOR;
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
checkNoLocals(inspectMethod(d8App, clazz, "int", "noLocals", "int"));
- checkNoLocals(inspectMethod(dxApp, clazz, "int", "noLocals", "int"));
- checkTempInCase(inspectMethod(d8App, clazz, "int", "tempInCase", "int"), false);
- checkTempInCase(inspectMethod(dxApp, clazz, "int", "tempInCase", "int"), true);
+ checkTempInCase(inspectMethod(d8App, clazz, "int", "tempInCase", "int"));
checkInitInCases(inspectMethod(d8App, clazz, "int", "initInCases", "int"));
- checkInitInCases(inspectMethod(dxApp, clazz, "int", "initInCases", "int"));
}
private void checkNoLocals(DebugInfoInspector info) {
@@ -42,7 +37,7 @@
info.checkLineHasExactLocals(15, "x", "int");
}
- private void checkTempInCase(DebugInfoInspector tempInCase, boolean dx) {
+ private void checkTempInCase(DebugInfoInspector tempInCase) {
// int res =
tempInCase.checkStartLine(20);
tempInCase.checkLineHasExactLocals(20, "x", "int");
@@ -52,17 +47,11 @@
// int rem =
tempInCase.checkLineHasExactLocals(22, "x", "int", "res", "int", "i", "int");
// switch (rem) {
- if (!dx) {
- // DX contains several entries for 23, one of which does not define 'rem'. Go figure...
- tempInCase.checkLineHasExactLocals(23, "x", "int", "res", "int", "i", "int", "rem", "int");
- }
+ tempInCase.checkLineHasExactLocals(23, "x", "int", "res", "int", "i", "int", "rem", "int");
// case 0:
tempInCase.checkNoLine(24);
// return res
- if (!dx) {
- // DX does not produce a position at the return statement. Good stuff.
- tempInCase.checkLineHasExactLocals(25, "x", "int", "res", "int", "i", "int", "rem", "int");
- }
+ tempInCase.checkLineHasExactLocals(25, "x", "int", "res", "int", "i", "int", "rem", "int");
// case 5:
tempInCase.checkNoLine(26);
// int tmp =
@@ -90,14 +79,9 @@
// }
tempInCase.checkNoLine(37);
// res *= x;
- if (!dx) {
- // DX fails to end the scope of "i" after the loop.
- tempInCase.checkLineHasExactLocals(38, "x", "int", "res", "int");
- }
+ tempInCase.checkLineHasExactLocals(38, "x", "int", "res", "int");
// return res;
- if (!dx) {
- tempInCase.checkLineHasExactLocals(39, "x", "int", "res", "int");
- }
+ tempInCase.checkLineHasExactLocals(39, "x", "int", "res", "int");
}
private void checkInitInCases(DebugInfoInspector info) {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/LocalsWithTypeParamsRunner.java b/src/test/java/com/android/tools/r8/debuginfo/LocalsWithTypeParamsRunner.java
index 2dd50ed..09a53ee 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/LocalsWithTypeParamsRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/LocalsWithTypeParamsRunner.java
@@ -22,15 +22,12 @@
@Test
public void testLocalsWithTypeParams() throws Exception {
AndroidApp d8App = compileWithD8(clazzMain, clazzA, clazzB);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "42";
assertEquals(expected, runOnJava(clazzMain));
assertEquals(expected, runOnArt(d8App, nameMain));
- assertEquals(expected, runOnArt(dxApp, nameMain));
checkSyncInstance(inspectMethod(d8App, clazzA, "int", "foo", nameB));
- checkSyncInstance(inspectMethod(dxApp, clazzA, "int", "foo", nameB));
}
private void checkSyncInstance(DebugInfoInspector info) {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/ScopedExceptionsTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/ScopedExceptionsTestRunner.java
index 436334a..dbf9243 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/ScopedExceptionsTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/ScopedExceptionsTestRunner.java
@@ -14,32 +14,23 @@
public void testScopedException() throws Exception {
Class clazz = ScopedExceptionsTest.class;
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = "42";
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
- checkScopedExceptions(inspectMethod(d8App, clazz, "int", "scopedExceptions"), false);
- checkScopedExceptions(inspectMethod(dxApp, clazz, "int", "scopedExceptions"), true);
+ checkScopedExceptions(inspectMethod(d8App, clazz, "int", "scopedExceptions"));
}
- private void checkScopedExceptions(DebugInfoInspector info, boolean dx) {
+ private void checkScopedExceptions(DebugInfoInspector info) {
info.checkStartLine(10);
info.checkLineHasNoLocals(10);
info.checkNoLine(11);
info.checkLineHasNoLocals(12);
info.checkLineHasNoLocals(13);
info.checkLineHasExactLocals(14, "e", "java.lang.Throwable");
- // DX does not generate a position at the end of the try-catch blocks, Java does and so does D8.
- if (!dx) {
- info.checkLineHasNoLocals(15);
- }
+ info.checkLineHasNoLocals(15);
info.checkLineExists(16);
- // DX will still have an local entry for 'e' after its scope has ended.
- if (!dx) {
- info.checkLineHasNoLocals(16);
- }
+ info.checkLineHasNoLocals(16);
}
}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/SynchronizedMethodTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/SynchronizedMethodTestRunner.java
index cd9e19d..f14d443 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/SynchronizedMethodTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/SynchronizedMethodTestRunner.java
@@ -25,26 +25,18 @@
@Test
public void testSynchronizedMethod() throws Exception {
AndroidApp d8App = compileWithD8(clazz);
- AndroidApp dxApp = getDxCompiledSources();
String expected = StringUtils.lines("42", "42", "2", "2");
assertEquals(expected, runOnJava(clazz));
assertEquals(expected, runOnArt(d8App, clazz.getCanonicalName()));
- assertEquals(expected, runOnArt(dxApp, clazz.getCanonicalName()));
checkSyncStatic(inspectMethod(d8App, clazz, "int", "syncStatic", "int"));
- checkSyncStatic(inspectMethod(dxApp, clazz, "int", "syncStatic", "int"));
checkSyncInstance(inspectMethod(d8App, clazz, "int", "syncInstance", "int"));
- checkSyncInstance(inspectMethod(dxApp, clazz, "int", "syncInstance", "int"));
- checkThrowing(inspectMethod(d8App, clazz, "int", "throwing", "int"), false);
- checkThrowing(inspectMethod(dxApp, clazz, "int", "throwing", "int"), true);
+ checkThrowing(inspectMethod(d8App, clazz, "int", "throwing", "int"));
- checkMonitorExitRegression(
- inspectMethod(d8App, clazz, "int", "monitorExitRegression", "int"), false);
- checkMonitorExitRegression(
- inspectMethod(dxApp, clazz, "int", "monitorExitRegression", "int"), true);
+ checkMonitorExitRegression(inspectMethod(d8App, clazz, "int", "monitorExitRegression", "int"));
}
private void checkSyncStatic(DebugInfoInspector info) {
@@ -66,23 +58,18 @@
info.checkNoLine(20);
}
- private void checkThrowing(DebugInfoInspector info, boolean dx) {
+ private void checkThrowing(DebugInfoInspector info) {
info.checkStartLine(23);
- if (!dx) {
- info.checkLineHasExactLocals(23, "cond", "int");
- }
+ info.checkLineHasExactLocals(23, "cond", "int");
info.checkLineHasExactLocals(24, "cond", "int", "x", "int");
info.checkLineHasExactLocals(25, "cond", "int", "x", "int");
info.checkNoLine(26);
info.checkLineHasExactLocals(27, "cond", "int", "x", "int");
}
- private void checkMonitorExitRegression(DebugInfoInspector info, boolean dx) {
+ private void checkMonitorExitRegression(DebugInfoInspector info) {
info.checkStartLine(31);
for (int line : Arrays.asList(32, 34, 36, 38, 40, 42, 44, 48, 50, 52)) {
- if (dx && line == 40) {
- continue;
- }
info.checkLineHasExactLocals(line, "cond", "int", "x", "int");
}
}
