Update test after requiring linenumberoptimization for dex PC output
Bug: 37830524
Bug: 191038746
Change-Id: Ie13c4aefa6be3611a4efbef420ea7516c88316d8
diff --git a/src/main/java/com/android/tools/r8/D8.java b/src/main/java/com/android/tools/r8/D8.java
index 2fadb7d..ac5cd11 100644
--- a/src/main/java/com/android/tools/r8/D8.java
+++ b/src/main/java/com/android/tools/r8/D8.java
@@ -44,7 +44,6 @@
import com.android.tools.r8.utils.ExceptionUtils;
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.InternalOptions.DesugarState;
-import com.android.tools.r8.utils.InternalOptions.LineNumberOptimization;
import com.android.tools.r8.utils.LineNumberOptimizer;
import com.android.tools.r8.utils.StringDiagnostic;
import com.android.tools.r8.utils.StringUtils;
@@ -348,8 +347,6 @@
private static ProguardMapSupplier finalizeApplication(
AndroidApp inputApp, AppView<AppInfo> appView, NamingLens namingLens) {
SyntheticFinalization.finalize(appView);
- // TODO(b/37830524): Once D8 supports PC mapping this will need to be run for that too.
- assert appView.options().lineNumberOptimization == LineNumberOptimization.OFF;
if (appView.options().proguardMapConsumer == null) {
return null;
}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/EnsureNoDebugInfoEmittedForPcOnlyTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/EnsureNoDebugInfoEmittedForPcOnlyTestRunner.java
index c2f1811..a91f006 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/EnsureNoDebugInfoEmittedForPcOnlyTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/EnsureNoDebugInfoEmittedForPcOnlyTestRunner.java
@@ -5,6 +5,7 @@
package com.android.tools.r8.debuginfo;
import static com.android.tools.r8.naming.retrace.StackTrace.isSameExceptForFileNameAndLineNumber;
+import static com.android.tools.r8.utils.InternalOptions.LineNumberOptimization.ON;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertNull;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -72,6 +73,11 @@
.addProgramClasses(MAIN)
.setMinApi(parameters.getApiLevel())
.internalEnableMappingOutput()
+ // TODO(b/191038746): Enable LineNumberOptimization for release builds for DEX PC Output.
+ .applyIf(
+ apiLevelSupportsPcOutput(),
+ builder ->
+ builder.addOptionsModification(options -> options.lineNumberOptimization = ON))
.run(parameters.getRuntime(), MAIN)
.inspectFailure(
inspector -> {
