commit 67600ea4852332a9eefdd3e74b10e9c7a0132a64
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Nov 04 09:50:23 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Nov 04 09:50:23 2020 +0100
tree 9847067e524abc972b7251ddd1058b0b895ec7d9
parent 51a1635f97269f7f6cb47813bdaf2df5ec1b1349

Update phi's when inserting const null in LensCodeRewriter

This will help out the MemberValuePropagator for not computing invalid
types.

Bug: 171955352
Change-Id: Icd9b1a755075acd243ce7c1465ab1c7867420a8f

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 8e1ee32..e1c9063 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
@@ -273,7 +273,7 @@
                         .setLocalInfo(invoke.outValue().getLocalInfo());
                   }
                   invoke.outValue().replaceUsers(constantReturnMaterializingInstruction.outValue());
-                  if (graphLens.lookupType(invoke.getReturnType()) != invoke.getReturnType()) {
+                  if (invoke.getOutType() != constantReturnMaterializingInstruction.getOutType()) {
                     affectedPhis.addAll(
                         constantReturnMaterializingInstruction.outValue().uniquePhiUsers());
                   }