Fix isNonLegacySynthetic() predicate in synthetic items
Change-Id: I23293c4257c41a9b4a3d0fc965d6cc4ba5b511e8
diff --git a/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java b/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java
index cd8090f..ef9ff5c 100644
--- a/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java
+++ b/src/main/java/com/android/tools/r8/synthesis/SyntheticItems.java
@@ -198,6 +198,10 @@
return committed.containsLegacyType(type);
}
+ private boolean isNonLegacyCommittedSynthetic(DexType type) {
+ return committed.containsNonLegacyType(type);
+ }
+
public boolean isPendingSynthetic(DexType type) {
return pending.containsType(type);
}
@@ -206,6 +210,10 @@
return pending.legacyClasses.containsKey(type);
}
+ private boolean isNonLegacyPendingSynthetic(DexType type) {
+ return pending.nonLegacyDefinitions.containsKey(type);
+ }
+
public boolean isLegacySyntheticClass(DexType type) {
return isLegacyCommittedSynthetic(type) || isLegacyPendingSynthetic(type);
}
@@ -219,7 +227,7 @@
}
public boolean isNonLegacySynthetic(DexType type) {
- return isCommittedSynthetic(type) || isPendingSynthetic(type);
+ return isNonLegacyCommittedSynthetic(type) || isNonLegacyPendingSynthetic(type);
}
public boolean isEligibleForClassMerging(DexProgramClass clazz) {
