commit 889fd7e28f209b88279f1c52f696b063b21695ed
author Jinseong Jeon <jsjeon@google.com> Wed Dec 12 17:25:03 2018 -0800
committer Jinseong Jeon <jsjeon@google.com> Wed Dec 12 17:25:03 2018 -0800
tree 32cfb9761aa067bf02b6e531117bf5405da2794d
parent 5aa9bd9588d0003860a071b0fc7b7f6694b6f469

Version 1.3.45

Merge: Change missing class assert to reporting.
CL: https://r8-review.googlesource.com/c/r8/+/30560/

Bug: 114475506, 120900973
Change-Id: I96155f152d8a49f482958e871674f5565637f43f

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 0c63c7b..8b14556 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "1.3.44";
+  public static final String LABEL = "1.3.45";
 
   private Version() {
   }

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 d32402a..fc95770 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -915,7 +915,10 @@
   private void transitionDefaultMethodsForInstantiatedClass(DexType iface, DexType instantiatedType,
       ScopedDexMethodSet seen) {
     DexClass clazz = appInfo.definitionFor(iface);
-    assert clazz != null : "Missing class " + iface.toSourceString();
+    if (clazz == null) {
+      reportMissingClass(iface);
+      return;
+    }
     assert clazz.accessFlags.isInterface();
     SetWithReason<DexEncodedMethod> reachableMethods = reachableVirtualMethods.get(iface);
     if (reachableMethods != null) {