commit e8b4803dbe9a9559a0c2627f52dcb10dc6912b1f
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Sep 08 19:49:23 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Sep 08 17:50:53 2021 +0000
tree e7b563d992e42728069fbd89f4b1268845b3ccfb
parent d80205dec3e6ae29860b19c2c1d11f9df3342766

Fix inadequate type propagation in lens code rewriter

Change-Id: I110a789e2927fec7545f99c712dcf4e6b920cbda

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 688a21e..0356381 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
@@ -631,6 +631,7 @@
                 TypeElement substituted = type.rewrittenWithLens(appView, graphLens);
                 if (substituted != type) {
                   assert type.isArrayType() || type.isClassType();
+                  affectedPhis.addAll(assume.outValue().uniquePhiUsers());
                   if (substituted.isPrimitiveType()) {
                     assert type.isClassType();
                     assert appView.unboxedEnums().isUnboxedEnum(type.asClassType().getClassType());
@@ -643,7 +644,6 @@
                     // Non-null assumptions on a class array type being converted to a primitive
                     // array type remains, but dynamic type becomes irrelevant.
                     assume.unsetDynamicTypeAssumption();
-                    affectedPhis.addAll(assume.outValue().uniquePhiUsers());
                     if (assume.hasNonNullAssumption()) {
                       assume.outValue().setType(substituted);
                     } else {
@@ -654,7 +654,6 @@
                     assert !substituted.isPrimitiveType();
                     assert !substituted.isPrimitiveArrayType();
                     current.outValue().setType(substituted);
-                    affectedPhis.addAll(current.outValue().uniquePhiUsers());
                   }
                 }
               }