Rename DexEncodedMethod#parameters() for consistency with DexMethod
Change-Id: Iad2635e059224e4378c655ec4ecc503cd60a565f
diff --git a/src/main/java/com/android/tools/r8/PrintUses.java b/src/main/java/com/android/tools/r8/PrintUses.java
index ef8708f..782094c 100644
--- a/src/main/java/com/android/tools/r8/PrintUses.java
+++ b/src/main/java/com/android/tools/r8/PrintUses.java
@@ -256,7 +256,7 @@
if (superTarget != null) {
addMethod(superTarget.getReference());
}
- for (DexType type : method.getDefinition().parameters().values) {
+ for (DexType type : method.getDefinition().getParameters()) {
registerTypeReference(type);
}
for (DexAnnotation annotation : method.getDefinition().annotations().annotations) {
diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
index fc56e08..8060cbe 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -394,12 +394,16 @@
return method;
}
- public DexMethodSignature getSignature() {
- return new DexMethodSignature(method);
+ public DexType getParameter(int index) {
+ return getReference().getParameter(index);
}
- public DexTypeList parameters() {
- return method.proto.parameters;
+ public DexTypeList getParameters() {
+ return getReference().getParameters();
+ }
+
+ public DexMethodSignature getSignature() {
+ return new DexMethodSignature(method);
}
public DexType returnType() {
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java
index 40b0c86..88845d9 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java
@@ -112,7 +112,7 @@
// Browse annotation values types in search for enum.
// Each annotation value is represented by a virtual method.
for (DexEncodedMethod method : clazz.virtualMethods()) {
- assert method.parameters().isEmpty()
+ assert method.getParameters().isEmpty()
|| appView.options().testing.allowInjectedAnnotationMethods;
DexType valueType = method.returnType().toBaseType(appView.dexItemFactory());
if (enumToUnboxCandidates.isCandidate(valueType)) {
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/info/ConcreteCallSiteOptimizationInfo.java b/src/main/java/com/android/tools/r8/ir/optimize/info/ConcreteCallSiteOptimizationInfo.java
index 33b7242..ded60a3 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/info/ConcreteCallSiteOptimizationInfo.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/info/ConcreteCallSiteOptimizationInfo.java
@@ -85,7 +85,7 @@
}
for (int i = 0; i < method.method.getArity(); i++) {
staticTypes[i + argOffset] =
- TypeElement.fromDexType(method.parameters().values[i], maybeNull(), appView);
+ TypeElement.fromDexType(method.getParameter(i), maybeNull(), appView);
}
return staticTypes;
}
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 f7ac800..abbea2d 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -4050,7 +4050,7 @@
}
private void markParameterAndReturnTypesAsLive(ProgramMethod method) {
- for (DexType parameterType : method.getDefinition().parameters().values) {
+ for (DexType parameterType : method.getDefinition().getParameters()) {
markTypeAsLive(parameterType, method);
}
markTypeAsLive(method.getDefinition().returnType(), method);
diff --git a/src/main/java/com/android/tools/r8/tracereferences/Tracer.java b/src/main/java/com/android/tools/r8/tracereferences/Tracer.java
index 895f31e..286c83d 100644
--- a/src/main/java/com/android/tools/r8/tracereferences/Tracer.java
+++ b/src/main/java/com/android/tools/r8/tracereferences/Tracer.java
@@ -467,7 +467,7 @@
if (superTarget != null) {
addMethod(superTarget.getReference());
}
- for (DexType type : method.getDefinition().parameters().values) {
+ for (DexType type : method.getDefinition().getParameters()) {
registerTypeReference(type);
}
for (DexAnnotation annotation : method.getDefinition().annotations().annotations) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionMappingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionMappingTest.java
index 30f5c93..d8a7d6b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionMappingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionMappingTest.java
@@ -78,8 +78,8 @@
if (method.getFinalName().equals("main")) {
continue;
}
- foundZeroArgumentMethod |= method.getMethod().parameters().size() == 0;
- foundOneArgumentMethod |= method.getMethod().parameters().size() == 1;
+ foundZeroArgumentMethod |= method.getMethod().getParameters().size() == 0;
+ foundOneArgumentMethod |= method.getMethod().getParameters().size() == 1;
}
assertTrue(foundZeroArgumentMethod);
assertTrue(foundOneArgumentMethod);
