commit 3d1d8bd29667c97653b746ca846f7c59808d5003
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 25 13:05:12 2022 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 25 13:05:12 2022 +0100
tree 886b372760958016a8c3daf1bcc5b79da7f9a322
parent af9864f63b949d0d9f395df20ce458944e9474f3

Run null check insertion prior to phi removal

Change-Id: Iac1c4850addcc5212e215008c4120f9dfba30712

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

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
index 43c21b3..8bcdea8 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
@@ -788,12 +788,12 @@
       new DestructivePhiTypeUpdater(appView, graphLens, codeLens)
           .recomputeAndPropagateTypes(code, affectedPhis);
     }
+    nullCheckInserter.processWorklist();
     code.removeAllDeadAndTrivialPhis();
     removeUnusedArguments(method, code, unusedArguments);
 
     // Finalize cast and null check insertion.
     interfaceTypeToClassTypeRewriterHelper.processWorklist();
-    nullCheckInserter.processWorklist();
 
     assert code.isConsistentSSABeforeTypesAreCorrect();
   }