Remove minification methods from IndexedItemCollection
Change-Id: I570cf15a473608af4445454912758598f67419da
diff --git a/src/main/java/com/android/tools/r8/dex/IndexedItemCollection.java b/src/main/java/com/android/tools/r8/dex/IndexedItemCollection.java
index 4da7302..393439d 100644
--- a/src/main/java/com/android/tools/r8/dex/IndexedItemCollection.java
+++ b/src/main/java/com/android/tools/r8/dex/IndexedItemCollection.java
@@ -98,16 +98,4 @@
* @return true if the method handle was not in the pool before.
*/
boolean addMethodHandle(DexMethodHandle methodHandle);
-
- default DexString getRenamedName(DexMethod method) {
- return method.name;
- }
-
- default DexString getRenamedName(DexField field) {
- return field.name;
- }
-
- default DexString getRenamedDescriptor(DexType type) {
- return type.descriptor;
- }
}
diff --git a/src/main/java/com/android/tools/r8/dex/VirtualFile.java b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
index 4ca4b2b..80b9a6c 100644
--- a/src/main/java/com/android/tools/r8/dex/VirtualFile.java
+++ b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
@@ -609,27 +609,6 @@
int getNumberOfFields() {
return fields.size();
}
-
- int getNumberOfStrings() {
- return strings.size();
- }
-
- @Override
- public DexString getRenamedDescriptor(DexType type) {
- return namingLens.lookupDescriptor(type);
- }
-
- @Override
- public DexString getRenamedName(DexMethod method) {
- DexMethod mappedMethod = graphLens.lookupMethod(method);
- assert namingLens.verifyRenamingConsistentWithResolution(mappedMethod);
- return namingLens.lookupName(mappedMethod);
- }
-
- @Override
- public DexString getRenamedName(DexField field) {
- return namingLens.lookupName(graphLens.lookupField(field));
- }
}
public static class IndexedItemTransaction implements IndexedItemCollection {
@@ -710,22 +689,6 @@
return maybeInsert(methodHandle, methodHandles, base.methodHandles);
}
- @Override
- public DexString getRenamedDescriptor(DexType type) {
- return getNamingLens().lookupDescriptor(type);
- }
-
- @Override
- public DexString getRenamedName(DexMethod method) {
- assert getNamingLens().verifyRenamingConsistentWithResolution(method);
- return getNamingLens().lookupName(method);
- }
-
- @Override
- public DexString getRenamedName(DexField field) {
- return getNamingLens().lookupName(field);
- }
-
int getNumberOfMethods() {
return methods.size() + base.getNumberOfMethods();
}
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexCheckCast.java b/src/main/java/com/android/tools/r8/dex/code/DexCheckCast.java
index 939866d..650655a 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexCheckCast.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexCheckCast.java
@@ -66,7 +66,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexType rewritten = appView.graphLens().lookupType(getType());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexConstClass.java b/src/main/java/com/android/tools/r8/dex/code/DexConstClass.java
index 7fafee9..bc476c1 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexConstClass.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexConstClass.java
@@ -66,7 +66,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexType rewritten = appView.graphLens().lookupType(getType());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexConstMethodHandle.java b/src/main/java/com/android/tools/r8/dex/code/DexConstMethodHandle.java
index fad4723..87964c8 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexConstMethodHandle.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexConstMethodHandle.java
@@ -100,7 +100,7 @@
DexMethodHandle rewritten =
rewriter.rewriteDexMethodHandle(
getMethodHandle(), MethodHandleUse.NOT_ARGUMENT_TO_LAMBDA_METAFACTORY, context);
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexConstMethodType.java b/src/main/java/com/android/tools/r8/dex/code/DexConstMethodType.java
index 25727a7..68f49fb 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexConstMethodType.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexConstMethodType.java
@@ -94,7 +94,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexProto rewritten = rewriter.rewriteProto(getMethodType());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexFilledNewArray.java b/src/main/java/com/android/tools/r8/dex/code/DexFilledNewArray.java
index 0813d05..ab52b2b 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexFilledNewArray.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexFilledNewArray.java
@@ -50,7 +50,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexType rewritten = appView.graphLens().lookupType(getType());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
public DexType getType() {
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexFilledNewArrayRange.java b/src/main/java/com/android/tools/r8/dex/code/DexFilledNewArrayRange.java
index c6544b2..5e473dc 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexFilledNewArrayRange.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexFilledNewArrayRange.java
@@ -50,7 +50,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexType rewritten = appView.graphLens().lookupType(getType());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
public DexType getType() {
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexFormat45cc.java b/src/main/java/com/android/tools/r8/dex/code/DexFormat45cc.java
index e09b9d5..bdc0a15 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexFormat45cc.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexFormat45cc.java
@@ -103,10 +103,10 @@
MethodLookupResult lookup =
appView.graphLens().lookupMethod(getMethod(), context.getReference(), Type.POLYMORPHIC);
assert lookup.getType() == Type.POLYMORPHIC;
- lookup.getReference().collectIndexedItems(indexedItems);
+ lookup.getReference().collectIndexedItems(appView, indexedItems);
DexProto rewrittenProto = rewriter.rewriteProto(getProto());
- rewrittenProto.collectIndexedItems(indexedItems);
+ rewrittenProto.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexFormat4rcc.java b/src/main/java/com/android/tools/r8/dex/code/DexFormat4rcc.java
index 04dc240..a96b70b 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexFormat4rcc.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexFormat4rcc.java
@@ -119,10 +119,10 @@
MethodLookupResult lookup =
appView.graphLens().lookupMethod(getMethod(), context.getReference(), Type.POLYMORPHIC);
assert lookup.getType() == Type.POLYMORPHIC;
- lookup.getReference().collectIndexedItems(indexedItems);
+ lookup.getReference().collectIndexedItems(appView, indexedItems);
DexProto rewrittenProto = rewriter.rewriteProto(getProto());
- rewrittenProto.collectIndexedItems(indexedItems);
+ rewrittenProto.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexIgetOrIput.java b/src/main/java/com/android/tools/r8/dex/code/DexIgetOrIput.java
index 6d763e8..d1c298a 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexIgetOrIput.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexIgetOrIput.java
@@ -29,7 +29,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexField rewritten = appView.graphLens().lookupField(getField());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexInitClass.java b/src/main/java/com/android/tools/r8/dex/code/DexInitClass.java
index 4c7b12d..b1e5025 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexInitClass.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexInitClass.java
@@ -55,7 +55,7 @@
// that the init class lens maps classes in the final program to fields in the final program.
DexType rewrittenClass = appView.graphLens().lookupType(clazz);
DexField clinitField = appView.initClassLens().getInitClassField(rewrittenClass);
- clinitField.collectIndexedItems(indexedItems);
+ clinitField.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexInstanceOf.java b/src/main/java/com/android/tools/r8/dex/code/DexInstanceOf.java
index 400a152..601dffb 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexInstanceOf.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexInstanceOf.java
@@ -61,7 +61,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexType rewritten = appView.graphLens().lookupType(getType());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
public DexType getType() {
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexInvokeCustom.java b/src/main/java/com/android/tools/r8/dex/code/DexInvokeCustom.java
index 739ddae..605b420 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexInvokeCustom.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexInvokeCustom.java
@@ -51,7 +51,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexCallSite rewritten = rewriter.rewriteCallSite(getCallSite(), context);
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexInvokeCustomRange.java b/src/main/java/com/android/tools/r8/dex/code/DexInvokeCustomRange.java
index ddd958b..a88f338 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexInvokeCustomRange.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexInvokeCustomRange.java
@@ -51,7 +51,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexCallSite rewritten = rewriter.rewriteCallSite(getCallSite(), context);
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexInvokeMethod.java b/src/main/java/com/android/tools/r8/dex/code/DexInvokeMethod.java
index 2bf97f2..9340e4a 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexInvokeMethod.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexInvokeMethod.java
@@ -35,7 +35,7 @@
.graphLens()
.lookupMethod(getMethod(), context.getReference(), getInvokeType())
.getReference();
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexInvokeMethodRange.java b/src/main/java/com/android/tools/r8/dex/code/DexInvokeMethodRange.java
index 97032a0..34243ac 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexInvokeMethodRange.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexInvokeMethodRange.java
@@ -35,7 +35,7 @@
.graphLens()
.lookupMethod(getMethod(), context.getReference(), getInvokeType())
.getReference();
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexItemBasedConstString.java b/src/main/java/com/android/tools/r8/dex/code/DexItemBasedConstString.java
index 26e5c62..d34a783 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexItemBasedConstString.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexItemBasedConstString.java
@@ -45,7 +45,7 @@
IndexedItemCollection indexedItems,
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
- getItem().collectIndexedItems(indexedItems);
+ getItem().collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexNewArray.java b/src/main/java/com/android/tools/r8/dex/code/DexNewArray.java
index 11f3966..8d35555 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexNewArray.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexNewArray.java
@@ -51,7 +51,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexType rewritten = appView.graphLens().lookupType(getType());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexNewInstance.java b/src/main/java/com/android/tools/r8/dex/code/DexNewInstance.java
index ef1fd9a..4382e71 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexNewInstance.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexNewInstance.java
@@ -57,7 +57,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexType rewritten = appView.graphLens().lookupType(getType());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexRecordFieldValues.java b/src/main/java/com/android/tools/r8/dex/code/DexRecordFieldValues.java
index 83dad56..0c03729 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexRecordFieldValues.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexRecordFieldValues.java
@@ -43,7 +43,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
for (DexField field : fields) {
- field.collectIndexedItems(indexedItems);
+ field.collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexSgetOrSput.java b/src/main/java/com/android/tools/r8/dex/code/DexSgetOrSput.java
index 231984d..85c8ea3 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexSgetOrSput.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexSgetOrSput.java
@@ -30,7 +30,7 @@
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
DexField rewritten = appView.graphLens().lookupField(getField());
- rewritten.collectIndexedItems(indexedItems);
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/graph/DefaultInstanceInitializerCode.java b/src/main/java/com/android/tools/r8/graph/DefaultInstanceInitializerCode.java
index b001aa2..5569e34 100644
--- a/src/main/java/com/android/tools/r8/graph/DefaultInstanceInitializerCode.java
+++ b/src/main/java/com/android/tools/r8/graph/DefaultInstanceInitializerCode.java
@@ -178,7 +178,8 @@
IndexedItemCollection indexedItems,
ProgramMethod context,
LensCodeRewriterUtils rewriter) {
- getParentConstructor(context, rewriter.dexItemFactory()).collectIndexedItems(indexedItems);
+ getParentConstructor(context, rewriter.dexItemFactory())
+ .collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/graph/DexAnnotation.java b/src/main/java/com/android/tools/r8/graph/DexAnnotation.java
index d26278f..44ac005 100644
--- a/src/main/java/com/android/tools/r8/graph/DexAnnotation.java
+++ b/src/main/java/com/android/tools/r8/graph/DexAnnotation.java
@@ -101,8 +101,8 @@
return visibility + " " + annotation;
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- annotation.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ annotation.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/graph/DexAnnotationElement.java b/src/main/java/com/android/tools/r8/graph/DexAnnotationElement.java
index f351642..a2be262 100644
--- a/src/main/java/com/android/tools/r8/graph/DexAnnotationElement.java
+++ b/src/main/java/com/android/tools/r8/graph/DexAnnotationElement.java
@@ -60,9 +60,9 @@
return name + "=" + value;
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
name.collectIndexedItems(indexedItems);
- value.collectIndexedItems(indexedItems);
+ value.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/graph/DexAnnotationSet.java b/src/main/java/com/android/tools/r8/graph/DexAnnotationSet.java
index 40ff50e..38eb26e 100644
--- a/src/main/java/com/android/tools/r8/graph/DexAnnotationSet.java
+++ b/src/main/java/com/android/tools/r8/graph/DexAnnotationSet.java
@@ -116,9 +116,9 @@
return false;
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
for (DexAnnotation annotation : annotations) {
- annotation.collectIndexedItems(indexedItems);
+ annotation.collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexCallSite.java b/src/main/java/com/android/tools/r8/graph/DexCallSite.java
index 3aa03da..f820b52 100644
--- a/src/main/java/com/android/tools/r8/graph/DexCallSite.java
+++ b/src/main/java/com/android/tools/r8/graph/DexCallSite.java
@@ -160,13 +160,13 @@
return builder.toString();
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
if (indexedItems.addCallSite(this)) {
methodName.collectIndexedItems(indexedItems);
- methodProto.collectIndexedItems(indexedItems);
- bootstrapMethod.collectIndexedItems(indexedItems);
+ methodProto.collectIndexedItems(appView, indexedItems);
+ bootstrapMethod.collectIndexedItems(appView, indexedItems);
for (DexValue arg : bootstrapArgs) {
- arg.collectIndexedItems(indexedItems);
+ arg.collectIndexedItems(appView, indexedItems);
}
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexCode.java b/src/main/java/com/android/tools/r8/graph/DexCode.java
index 8e7b80e..0a485e7 100644
--- a/src/main/java/com/android/tools/r8/graph/DexCode.java
+++ b/src/main/java/com/android/tools/r8/graph/DexCode.java
@@ -604,10 +604,10 @@
}
}
if (debugInfo != null) {
- getDebugInfoForWriting().collectIndexedItems(indexedItems, appView.graphLens());
+ getDebugInfoForWriting().collectIndexedItems(appView, indexedItems);
}
for (TryHandler handler : handlers) {
- handler.collectIndexedItems(indexedItems, appView.graphLens());
+ handler.collectIndexedItems(appView, indexedItems);
}
}
@@ -813,9 +813,9 @@
return Equatable.equalsImpl(this, other);
}
- public void collectIndexedItems(IndexedItemCollection indexedItems, GraphLens graphLens) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
for (TypeAddrPair pair : pairs) {
- pair.collectIndexedItems(indexedItems, graphLens);
+ pair.collectIndexedItems(appView, indexedItems);
}
}
@@ -877,9 +877,9 @@
return lens.lookupType(type);
}
- public void collectIndexedItems(IndexedItemCollection indexedItems, GraphLens graphLens) {
- DexType rewritten = getType(graphLens);
- rewritten.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ DexType rewritten = getType(appView.graphLens());
+ rewritten.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/graph/DexDebugEvent.java b/src/main/java/com/android/tools/r8/graph/DexDebugEvent.java
index 27aacbe..16bf079 100644
--- a/src/main/java/com/android/tools/r8/graph/DexDebugEvent.java
+++ b/src/main/java/com/android/tools/r8/graph/DexDebugEvent.java
@@ -23,7 +23,7 @@
public static final DexDebugEvent[] EMPTY_ARRAY = {};
- public void collectIndexedItems(IndexedItemCollection collection, GraphLens graphLens) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection collection) {
// Empty by default.
}
@@ -350,13 +350,13 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection collection, GraphLens graphLens) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection collection) {
if (name != null) {
name.collectIndexedItems(collection);
}
if (type != null) {
- DexType rewritten = graphLens.lookupType(type);
- rewritten.collectIndexedItems(collection);
+ DexType rewritten = appView.graphLens().lookupType(type);
+ rewritten.collectIndexedItems(appView, collection);
}
if (signature != null) {
signature.collectIndexedItems(collection);
@@ -524,7 +524,7 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection collection, GraphLens graphLens) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection collection) {
fileName.collectIndexedItems(collection);
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexDebugInfo.java b/src/main/java/com/android/tools/r8/graph/DexDebugInfo.java
index 88d9f04..b6f5fd9 100644
--- a/src/main/java/com/android/tools/r8/graph/DexDebugInfo.java
+++ b/src/main/java/com/android/tools/r8/graph/DexDebugInfo.java
@@ -144,7 +144,7 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems, GraphLens graphLens) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
// No indexed items to collect.
}
@@ -255,14 +255,14 @@
return visitor.visit(this, other.asEventBasedInfo(), EventBasedDebugInfo::specify);
}
- public void collectIndexedItems(IndexedItemCollection indexedItems, GraphLens graphLens) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
for (DexString parameter : parameters) {
if (parameter != null) {
parameter.collectIndexedItems(indexedItems);
}
}
for (DexDebugEvent event : events) {
- event.collectIndexedItems(indexedItems, graphLens);
+ event.collectIndexedItems(appView, indexedItems);
}
}
@@ -337,8 +337,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems, GraphLens graphLens) {
- super.collectIndexedItems(indexedItems, graphLens);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ super.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/graph/DexDebugInfoForWriting.java b/src/main/java/com/android/tools/r8/graph/DexDebugInfoForWriting.java
index 5f94db9..75cdd80 100644
--- a/src/main/java/com/android/tools/r8/graph/DexDebugInfoForWriting.java
+++ b/src/main/java/com/android/tools/r8/graph/DexDebugInfoForWriting.java
@@ -13,7 +13,7 @@
void collectMixedSectionItems(MixedSectionCollection collection);
- void collectIndexedItems(IndexedItemCollection indexedItems, GraphLens graphLens);
+ void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems);
int estimatedWriteSize();
diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedAnnotation.java b/src/main/java/com/android/tools/r8/graph/DexEncodedAnnotation.java
index e338ef5..0d4f388 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedAnnotation.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedAnnotation.java
@@ -41,10 +41,10 @@
return DexEncodedAnnotation::specify;
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- type.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ type.collectIndexedItems(appView, indexedItems);
for (DexAnnotationElement element : elements) {
- element.collectIndexedItems(indexedItems);
+ element.collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedArray.java b/src/main/java/com/android/tools/r8/graph/DexEncodedArray.java
index 19ec6c2..4192720 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedArray.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedArray.java
@@ -15,9 +15,9 @@
this.values = values;
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
for (DexValue value : values) {
- value.collectIndexedItems(indexedItems);
+ value.collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexField.java b/src/main/java/com/android/tools/r8/graph/DexField.java
index 1f86536..9fbbdb1 100644
--- a/src/main/java/com/android/tools/r8/graph/DexField.java
+++ b/src/main/java/com/android/tools/r8/graph/DexField.java
@@ -143,11 +143,11 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
if (indexedItems.addField(this)) {
- holder.collectIndexedItems(indexedItems);
- type.collectIndexedItems(indexedItems);
- indexedItems.getRenamedName(this).collectIndexedItems(indexedItems);
+ holder.collectIndexedItems(appView, indexedItems);
+ type.collectIndexedItems(appView, indexedItems);
+ appView.getNamingLens().lookupName(this).collectIndexedItems(indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexMemberAnnotation.java b/src/main/java/com/android/tools/r8/graph/DexMemberAnnotation.java
index 5c9dad2..5bac75e 100644
--- a/src/main/java/com/android/tools/r8/graph/DexMemberAnnotation.java
+++ b/src/main/java/com/android/tools/r8/graph/DexMemberAnnotation.java
@@ -44,9 +44,9 @@
super(item, annotations);
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- item.collectIndexedItems(indexedItems);
- annotations.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ item.collectIndexedItems(appView, indexedItems);
+ annotations.collectIndexedItems(appView, indexedItems);
}
}
@@ -56,9 +56,9 @@
super(item, annotations);
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- item.collectIndexedItems(indexedItems);
- annotations.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ item.collectIndexedItems(appView, indexedItems);
+ annotations.collectIndexedItems(appView, indexedItems);
}
}
@@ -69,9 +69,9 @@
super(item, annotations);
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- item.collectIndexedItems(indexedItems);
- annotations.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ item.collectIndexedItems(appView, indexedItems);
+ annotations.collectIndexedItems(appView, indexedItems);
}
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexMethod.java b/src/main/java/com/android/tools/r8/graph/DexMethod.java
index 921d0a6..2fbdbdc 100644
--- a/src/main/java/com/android/tools/r8/graph/DexMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexMethod.java
@@ -174,23 +174,23 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- if (collectIndexedItemsExceptName(indexedItems)) {
- collectIndexedItemsName(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ if (collectIndexedItemsExceptName(appView, indexedItems)) {
+ collectIndexedItemsName(appView, indexedItems);
}
}
- boolean collectIndexedItemsExceptName(IndexedItemCollection indexedItems) {
+ boolean collectIndexedItemsExceptName(AppView<?> appView, IndexedItemCollection indexedItems) {
if (indexedItems.addMethod(this)) {
- holder.collectIndexedItems(indexedItems);
- proto.collectIndexedItems(indexedItems);
+ holder.collectIndexedItems(appView, indexedItems);
+ proto.collectIndexedItems(appView, indexedItems);
return true;
}
return false;
}
- void collectIndexedItemsName(IndexedItemCollection indexedItems) {
- indexedItems.getRenamedName(this).collectIndexedItems(indexedItems);
+ void collectIndexedItemsName(AppView<?> appView, IndexedItemCollection indexedItems) {
+ appView.getNamingLens().lookupName(this).collectIndexedItems(indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/graph/DexMethodHandle.java b/src/main/java/com/android/tools/r8/graph/DexMethodHandle.java
index 63c3261..8859c3c 100644
--- a/src/main/java/com/android/tools/r8/graph/DexMethodHandle.java
+++ b/src/main/java/com/android/tools/r8/graph/DexMethodHandle.java
@@ -254,22 +254,22 @@
return builder.toString();
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
if (indexedItems.addMethodHandle(this)) {
if (member.isDexField()) {
DexField field = member.asDexField();
- field.collectIndexedItems(indexedItems);
+ field.collectIndexedItems(appView, indexedItems);
} else {
DexMethod method = member.asDexMethod();
if (rewrittenTarget != null) {
// If there is a rewritten target we need to use that to get the right name of the
// targeted method (only member rebound methods take part in naming). The rest of the
// indexed items are collected from method.
- if (method.collectIndexedItemsExceptName(indexedItems)) {
- rewrittenTarget.collectIndexedItemsName(indexedItems);
+ if (method.collectIndexedItemsExceptName(appView, indexedItems)) {
+ rewrittenTarget.collectIndexedItemsName(appView, indexedItems);
}
} else {
- method.collectIndexedItems(indexedItems);
+ method.collectIndexedItems(appView, indexedItems);
}
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexProgramClass.java b/src/main/java/com/android/tools/r8/graph/DexProgramClass.java
index 2f5f6da..46bebdc 100644
--- a/src/main/java/com/android/tools/r8/graph/DexProgramClass.java
+++ b/src/main/java/com/android/tools/r8/graph/DexProgramClass.java
@@ -403,27 +403,27 @@
public void collectIndexedItems(
AppView<?> appView, IndexedItemCollection indexedItems, LensCodeRewriterUtils rewriter) {
if (indexedItems.addClass(this)) {
- type.collectIndexedItems(indexedItems);
+ type.collectIndexedItems(appView, indexedItems);
if (superType != null) {
- superType.collectIndexedItems(indexedItems);
+ superType.collectIndexedItems(appView, indexedItems);
} else {
assert type.toDescriptorString().equals("Ljava/lang/Object;");
}
if (sourceFile != null) {
sourceFile.collectIndexedItems(indexedItems);
}
- annotations().collectIndexedItems(indexedItems);
+ annotations().collectIndexedItems(appView, indexedItems);
if (interfaces != null) {
- interfaces.collectIndexedItems(indexedItems);
+ interfaces.collectIndexedItems(appView, indexedItems);
}
if (getEnclosingMethodAttribute() != null) {
- getEnclosingMethodAttribute().collectIndexedItems(indexedItems);
+ getEnclosingMethodAttribute().collectIndexedItems(appView, indexedItems);
}
for (InnerClassAttribute attribute : getInnerClasses()) {
- attribute.collectIndexedItems(indexedItems);
+ attribute.collectIndexedItems(appView, indexedItems);
}
// We are explicitly not adding items referenced in signatures.
- forEachProgramField(field -> field.collectIndexedItems(indexedItems));
+ forEachProgramField(field -> field.collectIndexedItems(appView, indexedItems));
forEachProgramMethod(method -> method.collectIndexedItems(appView, indexedItems, rewriter));
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexProto.java b/src/main/java/com/android/tools/r8/graph/DexProto.java
index 990eccc..80ff41d 100644
--- a/src/main/java/com/android/tools/r8/graph/DexProto.java
+++ b/src/main/java/com/android/tools/r8/graph/DexProto.java
@@ -96,11 +96,11 @@
return "Proto " + shorty + " " + returnType + " " + parameters;
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
if (indexedItems.addProto(this)) {
shorty.collectIndexedItems(indexedItems);
- returnType.collectIndexedItems(indexedItems);
- parameters.collectIndexedItems(indexedItems);
+ returnType.collectIndexedItems(appView, indexedItems);
+ parameters.collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexReference.java b/src/main/java/com/android/tools/r8/graph/DexReference.java
index e813d7c..6956170 100644
--- a/src/main/java/com/android/tools/r8/graph/DexReference.java
+++ b/src/main/java/com/android/tools/r8/graph/DexReference.java
@@ -45,7 +45,7 @@
throw new Unreachable();
}
- public abstract void collectIndexedItems(IndexedItemCollection indexedItems);
+ public abstract void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems);
public abstract int compareTo(DexReference other);
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 8a60b81..df11e7e 100644
--- a/src/main/java/com/android/tools/r8/graph/DexType.java
+++ b/src/main/java/com/android/tools/r8/graph/DexType.java
@@ -238,9 +238,9 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection collection) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection collection) {
if (collection.addType(this)) {
- collection.getRenamedDescriptor(this).collectIndexedItems(collection);
+ appView.getNamingLens().lookupDescriptor(this).collectIndexedItems(collection);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexTypeList.java b/src/main/java/com/android/tools/r8/graph/DexTypeList.java
index f07c38e..afba589 100644
--- a/src/main/java/com/android/tools/r8/graph/DexTypeList.java
+++ b/src/main/java/com/android/tools/r8/graph/DexTypeList.java
@@ -109,9 +109,9 @@
return Arrays.hashCode(values);
}
- void collectIndexedItems(IndexedItemCollection indexedItems) {
+ void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
for (DexType type : values) {
- type.collectIndexedItems(indexedItems);
+ type.collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/DexValue.java b/src/main/java/com/android/tools/r8/graph/DexValue.java
index 52a57bf..2cb6abd 100644
--- a/src/main/java/com/android/tools/r8/graph/DexValue.java
+++ b/src/main/java/com/android/tools/r8/graph/DexValue.java
@@ -350,7 +350,7 @@
dest.putByte((byte) ((arg << 5) | kind.toByte()));
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
// Intentionally left empty
}
@@ -1218,7 +1218,7 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
value.collectIndexedItems(indexedItems);
}
@@ -1305,8 +1305,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- value.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ value.collectIndexedItems(appView, indexedItems);
}
public NameComputationInfo<?> getNameComputationInfo() {
@@ -1384,8 +1384,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- value.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ value.collectIndexedItems(appView, indexedItems);
}
@Override
@@ -1426,8 +1426,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- value.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ value.collectIndexedItems(appView, indexedItems);
}
@Override
@@ -1468,8 +1468,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- value.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ value.collectIndexedItems(appView, indexedItems);
}
@Override
@@ -1510,8 +1510,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- value.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ value.collectIndexedItems(appView, indexedItems);
}
@Override
@@ -1562,8 +1562,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- value.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ value.collectIndexedItems(appView, indexedItems);
}
@Override
@@ -1606,9 +1606,9 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
for (DexValue value : values) {
- value.collectIndexedItems(indexedItems);
+ value.collectIndexedItems(appView, indexedItems);
}
}
@@ -1719,8 +1719,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- value.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ value.collectIndexedItems(appView, indexedItems);
}
@Override
@@ -1994,8 +1994,8 @@
}
@Override
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- value.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ value.collectIndexedItems(appView, indexedItems);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/graph/EnclosingMethodAttribute.java b/src/main/java/com/android/tools/r8/graph/EnclosingMethodAttribute.java
index d2ea75e..4062f96 100644
--- a/src/main/java/com/android/tools/r8/graph/EnclosingMethodAttribute.java
+++ b/src/main/java/com/android/tools/r8/graph/EnclosingMethodAttribute.java
@@ -81,12 +81,12 @@
enclosingMethod == ((EnclosingMethodAttribute) obj).enclosingMethod;
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
if (enclosingClass != null) {
- enclosingClass.collectIndexedItems(indexedItems);
+ enclosingClass.collectIndexedItems(appView, indexedItems);
}
if (enclosingMethod != null) {
- enclosingMethod.collectIndexedItems(indexedItems);
+ enclosingMethod.collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/InnerClassAttribute.java b/src/main/java/com/android/tools/r8/graph/InnerClassAttribute.java
index bb0fbf8..d2f5628 100644
--- a/src/main/java/com/android/tools/r8/graph/InnerClassAttribute.java
+++ b/src/main/java/com/android/tools/r8/graph/InnerClassAttribute.java
@@ -87,10 +87,10 @@
access);
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- inner.collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ inner.collectIndexedItems(appView, indexedItems);
if (outer != null) {
- outer.collectIndexedItems(indexedItems);
+ outer.collectIndexedItems(appView, indexedItems);
}
if (innerName != null) {
innerName.collectIndexedItems(indexedItems);
diff --git a/src/main/java/com/android/tools/r8/graph/ParameterAnnotationsList.java b/src/main/java/com/android/tools/r8/graph/ParameterAnnotationsList.java
index fdda61b..760b11d 100644
--- a/src/main/java/com/android/tools/r8/graph/ParameterAnnotationsList.java
+++ b/src/main/java/com/android/tools/r8/graph/ParameterAnnotationsList.java
@@ -119,9 +119,9 @@
return false;
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
for (DexAnnotationSet value : values) {
- value.collectIndexedItems(indexedItems);
+ value.collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/ProgramField.java b/src/main/java/com/android/tools/r8/graph/ProgramField.java
index 0007521..85146d6 100644
--- a/src/main/java/com/android/tools/r8/graph/ProgramField.java
+++ b/src/main/java/com/android/tools/r8/graph/ProgramField.java
@@ -14,12 +14,12 @@
super(holder, field);
}
- public void collectIndexedItems(IndexedItemCollection indexedItems) {
- getReference().collectIndexedItems(indexedItems);
+ public void collectIndexedItems(AppView<?> appView, IndexedItemCollection indexedItems) {
+ getReference().collectIndexedItems(appView, indexedItems);
DexEncodedField definition = getDefinition();
- definition.annotations().collectIndexedItems(indexedItems);
+ definition.annotations().collectIndexedItems(appView, indexedItems);
if (definition.isStatic() && definition.hasExplicitStaticValue()) {
- definition.getStaticValue().collectIndexedItems(indexedItems);
+ definition.getStaticValue().collectIndexedItems(appView, indexedItems);
}
}
diff --git a/src/main/java/com/android/tools/r8/graph/ProgramMethod.java b/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
index 9be5f56..7980af2 100644
--- a/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/ProgramMethod.java
@@ -68,13 +68,13 @@
AppView<?> appView, IndexedItemCollection indexedItems, LensCodeRewriterUtils rewriter) {
DexEncodedMethod definition = getDefinition();
assert !definition.isObsolete();
- getReference().collectIndexedItems(indexedItems);
+ getReference().collectIndexedItems(appView, indexedItems);
if (definition.hasCode()) {
Code code = definition.getCode();
code.asDexWritableCode().collectIndexedItems(appView, indexedItems, this, rewriter);
}
- definition.annotations().collectIndexedItems(indexedItems);
- definition.parameterAnnotationsList.collectIndexedItems(indexedItems);
+ definition.annotations().collectIndexedItems(appView, indexedItems);
+ definition.parameterAnnotationsList.collectIndexedItems(appView, indexedItems);
}
public boolean canBeConvertedToAbstractMethod(AppView<AppInfoWithLiveness> appView) {
diff --git a/src/main/java/com/android/tools/r8/graph/ThrowExceptionCode.java b/src/main/java/com/android/tools/r8/graph/ThrowExceptionCode.java
index 04290a0..789bb19 100644
--- a/src/main/java/com/android/tools/r8/graph/ThrowExceptionCode.java
+++ b/src/main/java/com/android/tools/r8/graph/ThrowExceptionCode.java
@@ -84,7 +84,7 @@
rewriter
.dexItemFactory()
.createInstanceInitializer(exceptionType)
- .collectIndexedItems(indexedItems);
+ .collectIndexedItems(appView, indexedItems);
}
@Override
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 5a1c617..295dc47 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -2281,7 +2281,7 @@
// annotation.
AnnotationReferenceMarker referenceMarker =
new AnnotationReferenceMarker(annotation, annotatedItem);
- annotation.annotation.collectIndexedItems(referenceMarker);
+ annotation.annotation.collectIndexedItems(appView, referenceMarker);
}
private boolean shouldKeepAnnotation(
diff --git a/src/main/java/com/android/tools/r8/shaking/MainDexDirectReferenceTracer.java b/src/main/java/com/android/tools/r8/shaking/MainDexDirectReferenceTracer.java
index 06ceb79..4cc4154 100644
--- a/src/main/java/com/android/tools/r8/shaking/MainDexDirectReferenceTracer.java
+++ b/src/main/java/com/android/tools/r8/shaking/MainDexDirectReferenceTracer.java
@@ -93,7 +93,7 @@
}
private void traceAnnotationsDirectDependencies(DexAnnotationSet annotations) {
- annotations.collectIndexedItems(annotationDirectReferenceCollector);
+ annotations.collectIndexedItems(appView, annotationDirectReferenceCollector);
}
private void traceMethodDirectDependencies(DexMethod method, Consumer<DexType> consumer) {
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GetGenericInterfaceTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GetGenericInterfaceTest.java
index a6eafe8..f010195 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GetGenericInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GetGenericInterfaceTest.java
@@ -83,8 +83,8 @@
String[] lines = stdOut.split("\n");
for (int i = 0; i < lines.length; i += 4) {
String className = lines[i];
- String[] interfaces1 = lines[i + 1].split("(, com|, interface|, j)");
- String[] interfaces2 = lines[i + 2].split("(, com|, interface|, j)");
+ String[] interfaces1 = lines[i + 1].split("(appView, com|, interface|, j)");
+ String[] interfaces2 = lines[i + 2].split("(appView, com|, interface|, j)");
assertEquals(
"Invalid number of interfaces in "
+ className
