commit 35ac1f06e9b60d23105174981d32057158b046a7
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Oct 14 14:58:00 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Oct 14 12:58:11 2020 +0000
tree f1fdaddb66223a19a52be1bf445ae5aae605afb4
parent 604ea7fe01216aa0fa982c6df5f6ca5a9febd286

Relax new assertion in BasicBlockBehavioralSubsumption

Change-Id: Ie7853846f3809a8b288a1de3d76cbfea6846cd1b

src/main/java/com/android/tools/r8/ir/analysis/equivalence/BasicBlockBehavioralSubsumption.java

diff --git a/src/main/java/com/android/tools/r8/ir/analysis/equivalence/BasicBlockBehavioralSubsumption.java b/src/main/java/com/android/tools/r8/ir/analysis/equivalence/BasicBlockBehavioralSubsumption.java
index d1731e9..ea4040c 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/equivalence/BasicBlockBehavioralSubsumption.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/equivalence/BasicBlockBehavioralSubsumption.java
@@ -162,13 +162,7 @@
     if (instruction.isInvokeConstructor(appView.dexItemFactory())) {
       DexEncodedMethod singleTarget =
           instruction.asInvokeDirect().lookupSingleTarget(appView, context);
-      if (singleTarget == null) {
-        assert false;
-        return false;
-      }
-      if (singleTarget.getOptimizationInfo().mayHaveSideEffects()) {
-        return false;
-      }
+      return singleTarget != null && !singleTarget.getOptimizationInfo().mayHaveSideEffects();
     }
     return true;
   }