commit 0ecdea344b98ae56fb167ee04d8e9526a2c1901e
author clementbera <clementbera@google.com> Tue Feb 18 13:23:26 2020 +0100
committer Clément Béra <clementbera@google.com> Tue Feb 18 14:12:17 2020 +0000
tree 666d78be2c143c143e7eae08612d7cedc79e0091
parent 18e73e2638dd6250fe99313d2dd2ce9fc6a38162

Use LensCodeRewriter only when needed

Bug: 149516194
Bug: 149364041
Change-Id: I0ea552f4e631a895a7f19efcc90a8f4e0a815c85

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index 270ecd9..ce65222 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -1126,9 +1126,8 @@
       codeRewriter.simplifyDebugLocals(code);
     }
 
-    // TODO(b/149364041): Remove !method.isProcessed().
-    if (lensCodeRewriter != null
-        && (!method.isProcessed() || appView.graphLense().hasCodeRewritings())) {
+    if (appView.graphLense().hasCodeRewritings()) {
+      assert lensCodeRewriter != null;
       timing.begin("Lens rewrite");
       lensCodeRewriter.rewrite(code, method);
       timing.end();