commit aa1d6831cb81418d481b331be6b4cff0b86ae98e
author Ian Zerny <zerny@google.com> Tue Oct 26 14:50:03 2021 +0200
committer Ian Zerny <zerny@google.com> Wed Oct 27 04:37:41 2021 +0000
tree 3730d724d494a80a7487b6fdc7c93fb71cd896b1
parent 0d6567e4076d22a9c6d2020282a66affbf302991

Rewrite source file when optimizing.

Fixes: 202367773
Change-Id: Id58968cf92736b1212dc7abcd690e76d558ab9ea

src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java

diff --git a/src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java b/src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java
index 696bce1..13d7fc6 100644
--- a/src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java
+++ b/src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java
@@ -49,8 +49,7 @@
     if (renaming != null) {
       return rewriteTo(renaming);
     }
-    if (appView.options().isMinifying()) {
-      // TODO(b/202367773): This should also apply if optimizing.
+    if (appView.options().isMinifying() || appView.options().isOptimizing()) {
       return rewriteToDefaultSourceFile();
     }
     return null;

src/test/java/com/android/tools/r8/R8RunExamplesCommon.java

diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesCommon.java b/src/test/java/com/android/tools/r8/R8RunExamplesCommon.java
index 08bb64b..b3bcdb4 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesCommon.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesCommon.java
@@ -146,7 +146,8 @@
                   .setMode(mode)
                   .setDisableTreeShaking(true)
                   .setDisableMinification(true)
-                  .addProguardConfiguration(ImmutableList.of("-keepattributes *"), Origin.unknown())
+                  .addProguardConfiguration(
+                      ImmutableList.of("-keepattributes *", "-dontoptimize"), Origin.unknown())
                   .build();
           ToolHelper.runR8(command, this::configure);
         break;

src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java

diff --git a/src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java b/src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java
index 05bbb73..ef9112c 100644
--- a/src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java
+++ b/src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java
@@ -25,7 +25,7 @@
 public class DebugInfoWhenInliningTest extends DebugTestBase {
 
   private static final String CLASS_NAME = "Inlining1";
-  private static final String SOURCE_FILE = "Inlining1.java";
+  private static final String SOURCE_FILE = "SourceFile";
 
   private DebugTestConfig makeConfig(
       LineNumberOptimization lineNumberOptimization, boolean writeProguardMap) throws Exception {