Fix signatures to satisfy errorprone
Bug: 130421335
Bug: 147485959
Change-Id: I183bbe144c56549cd9028eca8c6d9fcbe0d7601e
diff --git a/src/main/java/com/android/tools/r8/GenerateLintFiles.java b/src/main/java/com/android/tools/r8/GenerateLintFiles.java
index 17a97a3..17b7485 100644
--- a/src/main/java/com/android/tools/r8/GenerateLintFiles.java
+++ b/src/main/java/com/android/tools/r8/GenerateLintFiles.java
@@ -144,8 +144,8 @@
DexAnnotationSet.empty(),
ParameterAnnotationsList.empty(),
code,
- 50,
false,
+ 50,
false);
if (method.isStatic() || method.isDirectMethod()) {
directMethods.add(throwingMethod);
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 4bc477b..24776d0 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -228,7 +228,7 @@
DexAnnotationSet annotations,
ParameterAnnotationsList parameterAnnotationsList,
Code code) {
- this(method, accessFlags, annotations, parameterAnnotationsList, code, -1, false);
+ this(method, accessFlags, annotations, parameterAnnotationsList, code, false, -1);
}
public DexEncodedMethod(
@@ -238,7 +238,7 @@
ParameterAnnotationsList parameterAnnotationsList,
Code code,
boolean d8R8Synthesized) {
- this(method, accessFlags, annotations, parameterAnnotationsList, code, -1, d8R8Synthesized);
+ this(method, accessFlags, annotations, parameterAnnotationsList, code, d8R8Synthesized, -1);
}
public DexEncodedMethod(
@@ -247,16 +247,16 @@
DexAnnotationSet annotations,
ParameterAnnotationsList parameterAnnotationsList,
Code code,
- int classFileVersion,
- boolean d8R8Synthesized) {
+ boolean d8R8Synthesized,
+ int classFileVersion) {
this(
method,
accessFlags,
annotations,
parameterAnnotationsList,
code,
- classFileVersion,
d8R8Synthesized,
+ classFileVersion,
false);
}
@@ -266,8 +266,8 @@
DexAnnotationSet annotations,
ParameterAnnotationsList parameterAnnotationsList,
Code code,
- int classFileVersion,
boolean d8R8Synthesized,
+ int classFileVersion,
boolean deprecated) {
super(annotations);
this.method = method;
@@ -1527,8 +1527,8 @@
annotations,
parameterAnnotations,
code,
- classFileVersion,
- d8R8Synthesized);
+ d8R8Synthesized,
+ classFileVersion);
result.setKotlinMemberInfo(kotlinMemberInfo);
result.compilationState = compilationState;
result.optimizationInfo = optimizationInfo;
diff --git a/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java b/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
index a29fb97..ea58f8d 100644
--- a/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
+++ b/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
@@ -823,8 +823,8 @@
createAnnotationSet(annotations, options),
parameterAnnotationsList,
code,
- parent.version,
false,
+ parent.version,
deprecated);
Wrapper<DexMethod> signature = MethodSignatureEquivalence.get().wrap(method);
if (parent.methodSignatures.add(signature)) {
diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/ConstructorMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/ConstructorMerger.java
index 2f3c068..37e1690 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/ConstructorMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/ConstructorMerger.java
@@ -165,8 +165,8 @@
DexAnnotationSet.empty(),
ParameterAnnotationsList.empty(),
synthesizedCode,
- classFileVersion,
- true);
+ true,
+ classFileVersion);
if (isTrivialMerge()) {
// The constructor does not require the additional argument, just map it like a regular
diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/VirtualMethodMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/VirtualMethodMerger.java
index fd998a5..c8f2f6d 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/VirtualMethodMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/VirtualMethodMerger.java
@@ -170,8 +170,8 @@
DexAnnotationSet.empty(),
ParameterAnnotationsList.empty(),
synthesizedCode,
- classFileVersion,
- true);
+ true,
+ classFileVersion);
// Map each old method to the newly synthesized method in the graph lens.
for (ProgramMethod oldMethod : methods) {
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
index e09dab4..7d40dba 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
@@ -635,8 +635,8 @@
DexAnnotationSet.empty(),
ParameterAnnotationsList.empty(),
cfCode,
- REQUIRED_CLASS_FILE_VERSION,
- true);
+ true,
+ REQUIRED_CLASS_FILE_VERSION);
}
private MethodAccessFlags synthesizedMethodAccessFlags(boolean sync) {
diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index 953779d..0815577 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -1251,8 +1251,8 @@
DexAnnotationSet.empty(),
ParameterAnnotationsList.empty(),
code,
- method.hasClassFileVersion() ? method.getClassFileVersion() : -1,
- true);
+ true,
+ method.hasClassFileVersion() ? method.getClassFileVersion() : -1);
bridge.setLibraryMethodOverride(method.isLibraryMethodOverride());
if (method.accessFlags.isPromotedToPublic()) {
// The bridge is now the public method serving the role of the original method, and should
