commit ea578e039fe6b267af096d68fa2c316bf3d25cb9
author Stephan Herhut <herhut@google.com> Tue Nov 07 14:07:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 07 14:07:01 2017 +0000
tree 6c8af5bf0571000748bce30aba1d09f3524eba56
parent a80e7f0680f2030547cf5cff70c004766b4ab356
parent 4ec7e6c7dd066967066729136b6bae9de4d22564

Merge "Also mark interfaces without subtypes as interface."

src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java

diff --git a/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java b/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
index bf4dd3f..ad0f549 100644
--- a/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
+++ b/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
@@ -84,6 +84,9 @@
         populateSuperType(map, inter, baseClass, definitions);
         inter.addInterfaceSubtype(holder);
       }
+      if (holderClass.isInterface()) {
+        holder.tagAsInteface();
+      }
     } else {
       if (!baseClass.isLibraryClass()) {
         missingClasses.add(holder);

src/main/java/com/android/tools/r8/graph/DexType.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexType.java b/src/main/java/com/android/tools/r8/graph/DexType.java
index 478af70..d4deb54 100644
--- a/src/main/java/com/android/tools/r8/graph/DexType.java
+++ b/src/main/java/com/android/tools/r8/graph/DexType.java
@@ -71,23 +71,27 @@
     }
   }
 
-  public void addDirectSubtype(DexType type) {
+  void addDirectSubtype(DexType type) {
     assert hierarchyLevel != UNKNOWN_LEVEL;
     ensureDirectSubTypeSet();
     directSubtypes.add(type);
     type.setLevel(hierarchyLevel + 1);
   }
 
-  public void tagAsSubtypeRoot() {
+  void tagAsSubtypeRoot() {
     setLevel(ROOT_LEVEL);
   }
 
+  void tagAsInteface() {
+    setLevel(INTERFACE_LEVEL);
+  }
+
   public boolean isInterface() {
     assert isClassType() && hierarchyLevel != UNKNOWN_LEVEL;
     return hierarchyLevel == INTERFACE_LEVEL;
   }
 
-  public void addInterfaceSubtype(DexType type) {
+  void addInterfaceSubtype(DexType type) {
     // Interfaces all inherit from java.lang.Object. However, we assign a special level to
     // identify them later on.
     setLevel(INTERFACE_LEVEL);