commit 10a40892b629ea107dba5aa85f1344e81c9cd155
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 29 08:24:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 29 08:24:24 2018 +0000
tree 25bc92ea93f3421af583227be1300f104262bd2d
parent 281fbc18618bd0dfc2707f3074c7f09a629b3754
parent ba0717cd1558a2d0dcffab5d89dcfb1b8121cbaf

Merge "Only add keep rule when there is a default ctor"

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 d718026..19fe18e 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -460,10 +460,11 @@
         DexType baseType = type.toBaseType(appInfo.dexItemFactory);
         if (baseType.isClassType()) {
           DexClass baseClass = appInfo.definitionFor(baseType);
-          if (baseClass != null && !baseClass.isLibraryClass()) {
+          if (baseClass != null && baseClass.isProgramClass()
+              && baseClass.hasDefaultInitializer()) {
             markClassAsInstantiatedWithCompatRule(baseClass);
           } else {
-            // This handles reporting of missing classes.
+            // This also handles reporting of missing classes.
             markTypeAsLive(baseType);
           }
           return true;