commit 4919bc9aa4c7a3799fc823eef7b2fe589d5c77fc
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Sep 03 14:38:49 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Sep 03 13:24:03 2019 +0000
tree 510f0a95d0172bdb49cb4392d33b10ead8417f2b
parent 1e171530a47bb0e74af7631bab61d704185379ab

Fix missing type propagation in uninstantiated type optimization

Change-Id: I3da17084365b322f9c32c395bd250e9d35111b28

src/main/java/com/android/tools/r8/ir/code/Assume.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/Assume.java b/src/main/java/com/android/tools/r8/ir/code/Assume.java
index fca4c2e..7c2b109 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Assume.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Assume.java
@@ -231,6 +231,23 @@
   }
 
   @Override
+  public boolean verifyTypes(AppView<?> appView) {
+    assert super.verifyTypes(appView);
+
+    TypeLatticeElement inType = src().getTypeLattice();
+    TypeLatticeElement outType = outValue().getTypeLattice();
+    if (isAssumeDynamicType()) {
+      assert outType.equals(inType);
+    } else {
+      assert isAssumeNonNull();
+      assert inType.isReference();
+      assert inType.isNullType()
+          || outType.equals(inType.asReferenceTypeLatticeElement().asNotNull());
+    }
+    return true;
+  }
+
+  @Override
   public String toString() {
     if (isAssumeDynamicType()) {
       return super.toString() + "; type: " + asAssumeDynamicType().getAssumption().type;

src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java b/src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java
index 8d5bf96..0b043fe 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/UninstantiatedTypeOptimization.java
@@ -406,11 +406,7 @@
         }
         if (instruction.isFieldInstruction()) {
           rewriteFieldInstruction(
-              instruction.asFieldInstruction(),
-              blockIterator,
-              instructionIterator,
-              code,
-              blocksToBeRemoved);
+              instruction.asFieldInstruction(), instructionIterator, code, valuesToNarrow);
         } else if (instruction.isInvokeMethod()) {
           rewriteInvoke(
               instruction.asInvokeMethod(),
@@ -476,10 +472,9 @@
   // At this point, field-instruction whose target field type is uninstantiated will be handled.
   private void rewriteFieldInstruction(
       FieldInstruction instruction,
-      ListIterator<BasicBlock> blockIterator,
       InstructionListIterator instructionIterator,
       IRCode code,
-      Set<BasicBlock> blocksToBeRemoved) {
+      Set<Value> affectedValues) {
     DexType fieldType = instruction.getField().type;
     if (fieldType.isAlwaysNull(appView)) {
       AbstractError abstractError =
@@ -517,6 +512,7 @@
       } else {
         // Replace the field read by the constant null.
         instructionIterator.replaceCurrentInstruction(code.createConstNull());
+        affectedValues.addAll(instruction.outValue().affectedValues());
       }
 
       if (block.hasCatchHandlers()) {