commit 9eca3d3a30b509a8f7b850d7662b9f2a88f1bb9f
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 02 08:42:31 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 02 08:42:31 2020 +0200
tree a3e8d4b89371cab6f2ea4972bc7ca751f0d65c52
parent 117b14c5e77a8c779e5cf03a36c6150384cb6111

Extend call site optimization assert with message

Bug: 157546167
Change-Id: I58159c1ef1defd4b1d3176717a7b49e405b3f184

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CallSiteOptimizationInfoPropagator.java b/src/main/java/com/android/tools/r8/ir/optimize/CallSiteOptimizationInfoPropagator.java
index 9708120..7ee8700 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/CallSiteOptimizationInfoPropagator.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/CallSiteOptimizationInfoPropagator.java
@@ -440,7 +440,14 @@
     ProgramMethodSet targets = invoke.lookupProgramDispatchTargets(appView, context);
     if (targets != null) {
       for (ProgramMethod target : targets) {
-        assert target.getDefinition().getCallSiteOptimizationInfo().isAbandoned();
+        assert target.getDefinition().getCallSiteOptimizationInfo().isAbandoned()
+            : "Expected method `"
+                + target.toSourceString()
+                + "` to be marked as abandoned (called from `"
+                + invoke.toString()
+                + "` in `"
+                + context.toSourceString()
+                + "`)";
       }
     }
     return true;