Signature rename to fix build
Bug:134732760
Change-Id: I8ca2f37cc95ce8253145348a1648138b662e1c24
diff --git a/src/main/java/com/android/tools/r8/dex/DexParser.java b/src/main/java/com/android/tools/r8/dex/DexParser.java
index 6a269f8..7bf32be 100644
--- a/src/main/java/com/android/tools/r8/dex/DexParser.java
+++ b/src/main/java/com/android/tools/r8/dex/DexParser.java
@@ -1238,7 +1238,7 @@
DexString shorty = indexedItems.getString(shortyIndex);
DexType returnType = indexedItems.getType(returnTypeIndex);
DexTypeList parameters = typeListAt(parametersOffsetIndex);
- return dexItemFactory.createProto(returnType, shorty, parameters);
+ return dexItemFactory.createProto(returnType, parameters, shorty);
}
private DexMethod methodAt(int index) {
diff --git a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
index 726efc4..d7240eb 100644
--- a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
+++ b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
@@ -1203,7 +1203,7 @@
return createField(clazz, type, createString(name));
}
- public DexProto createProto(DexType returnType, DexString shorty, DexTypeList parameters) {
+ public DexProto createProto(DexType returnType, DexTypeList parameters, DexString shorty) {
assert !sorted;
DexProto proto = new DexProto(shorty, returnType, parameters);
return canonicalize(protos, proto);
@@ -1211,8 +1211,10 @@
public DexProto createProto(DexType returnType, DexType... parameters) {
assert !sorted;
- return createProto(returnType, createShorty(returnType, parameters),
- parameters.length == 0 ? DexTypeList.empty() : new DexTypeList(parameters));
+ return createProto(
+ returnType,
+ parameters.length == 0 ? DexTypeList.empty() : new DexTypeList(parameters),
+ createShorty(returnType, parameters));
}
public DexProto createProto(DexType returnType, List<DexType> parameters) {
diff --git a/src/main/java/com/android/tools/r8/graph/JarApplicationReader.java b/src/main/java/com/android/tools/r8/graph/JarApplicationReader.java
index 415f87a..147c165 100644
--- a/src/main/java/com/android/tools/r8/graph/JarApplicationReader.java
+++ b/src/main/java/com/android/tools/r8/graph/JarApplicationReader.java
@@ -118,10 +118,11 @@
for (int i = 0; i < argumentDescriptors.length; i++) {
shortyDescriptor.append(getShortyDescriptor(argumentDescriptors[i]));
}
- DexProto proto = options.itemFactory.createProto(
- getTypeFromDescriptor(returnTypeDescriptor),
- getString(shortyDescriptor.toString()),
- getTypeListFromDescriptors(argumentDescriptors));
+ DexProto proto =
+ options.itemFactory.createProto(
+ getTypeFromDescriptor(returnTypeDescriptor),
+ getTypeListFromDescriptors(argumentDescriptors),
+ getString(shortyDescriptor.toString()));
return proto;
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
index b2b88aa..e13f26f 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
@@ -145,7 +145,7 @@
DexClass clazz, DexEncodedMethod method, DexType covariantReturnType) {
DexProto newProto =
factory.createProto(
- covariantReturnType, method.method.proto.shorty, method.method.proto.parameters);
+ covariantReturnType, method.method.proto.parameters, method.method.proto.shorty);
MethodAccessFlags newAccessFlags = method.accessFlags.copy();
newAccessFlags.setBridge();
newAccessFlags.setSynthetic();
