commit 924ed96ea7299dc2d956eaf3851f64f079316802
author Rudi Horn <rudih@google.com> Thu Aug 13 14:22:45 2020 +0000
committer Rudi Horn <rudih@google.com> Fri Aug 14 10:42:50 2020 +0000
tree 17815c790b91bc59cc409a5be22baf65b60ee0fa
parent 2ec2d098915220b68f0c6e2d053182ba2bc9d3ee

Call instanceof callback from Enqueuer

Bug: 163475801
Bug: 163311975
Change-Id: I92a93b3e150b47238bd868484d66c789272cd394

src/main/java/com/android/tools/r8/shaking/Enqueuer.java

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 0c2b74b..6ed64fe 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -923,9 +923,6 @@
     return traceConstClassOrCheckCast(type, currentMethod);
   }
 
-  // TODO(b/163311975): traceInstanceOf (impl. by b/163471800) should call
-  // analysis.traceInstanceOf(...)
-
   boolean traceConstClass(DexType type, ProgramMethod currentMethod) {
     // We conservatively group T.class and T[].class to ensure that we do not merge T with S if
     // potential locks on T[].class and S[].class exists.
@@ -1046,6 +1043,7 @@
   }
 
   boolean traceInstanceOf(DexType type, ProgramMethod currentMethod) {
+    instanceOfAnalyses.forEach(analysis -> analysis.traceInstanceOf(type, currentMethod));
     return traceTypeReference(type, currentMethod);
   }