Also mark interfaces without subtypes as interface.
Before, this information was solely derived from the fact whether a type
was used in an implements relationship. Interfaces that had no subtypes
hence were not tagged as interfaces. Now, we also take definitions into
account.
Bug:
Change-Id: I4eefe81784cb23b1e01aaec0072017f038f4d282
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 a2caf1d..6c0c026 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);
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 5aaf308..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);
@@ -156,7 +160,7 @@
/**
* Apply the given function to all classes that directly extend this class.
- *
+ * <p>
* If this class is an interface, then this method will visit all sub-interfaces. This deviates
* from the dex-file encoding, where subinterfaces "implement" their super interfaces. However,
* it is consistent with the source language.
@@ -185,7 +189,7 @@
/**
* Apply the given function to all classes that directly implement this interface.
- *
+ * <p>
* The implementation does not consider how the hierarchy is encoded in the dex file, where
* interfaces "implement" their super interfaces. Instead it takes the view of the source
* language, where interfaces "extend" their superinterface.
