commit 62b3a4af8a0017ca8ebd236845894af2b462bdf0
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 26 06:41:58 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 26 06:41:58 2021 +0100
tree 25f38477d9bb33034cc7345bef74d7ca5d515d77
parent be6d7e0d9a166144fd775e2d6b1b76b20be50abf

Remove redundant method proto() in DexEncodedMethod

Change-Id: I64712dd1bf476a15612cfafa1da267bb8b9b74a4

src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java

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 dcb601b..fc56e08 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -385,7 +385,7 @@
   }
 
   public DexProto getProto() {
-    return getReference().proto;
+    return getReference().getProto();
   }
 
   @Override
@@ -402,10 +402,6 @@
     return method.proto.parameters;
   }
 
-  public DexProto proto() {
-    return method.proto;
-  }
-
   public DexType returnType() {
     return method.proto.returnType;
   }

src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
index 0a6a9b9..11001de 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
@@ -172,7 +172,7 @@
     return dexItemFactory.createFreshMethodName(
         method.getDefinition().method.name.toSourceString(),
         method.getHolderType(),
-        method.getDefinition().proto(),
+        method.getDefinition().getProto(),
         group.getTarget().getType(),
         classMethodsBuilder::isFresh);
   }

src/main/java/com/android/tools/r8/horizontalclassmerging/ConstructorMerger.java

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 b4e9887..13673fa 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/ConstructorMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/ConstructorMerger.java
@@ -45,7 +45,7 @@
 
     // Constructors should not be empty and all constructors should have the same prototype.
     assert !constructors.isEmpty();
-    assert constructors.stream().map(DexEncodedMethod::proto).distinct().count() == 1;
+    assert constructors.stream().map(DexEncodedMethod::getProto).distinct().count() == 1;
 
     this.dexItemFactory = appView.dexItemFactory();
   }
@@ -113,7 +113,7 @@
         dexItemFactory.createFreshMethodName(
             TEMPORARY_INSTANCE_INITIALIZER_PREFIX,
             constructor.getHolderType(),
-            constructor.proto(),
+            constructor.getProto(),
             group.getTarget().getType(),
             classMethodsBuilder::isFresh);
 

src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java b/src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java
index de727c4..5df390f 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CfSourceCode.java
@@ -407,7 +407,7 @@
       if (!getMethod().isStatic()) {
         firstLocalIndex++;
       }
-      for (DexType value : getMethod().proto().parameters.values) {
+      for (DexType value : getMethod().getProto().parameters.values) {
         firstLocalIndex++;
         if (value.isLongType() || value.isDoubleType()) {
           firstLocalIndex++;

src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryAPIConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryAPIConverter.java b/src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryAPIConverter.java
index cf85276..860af39 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryAPIConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/DesugaredLibraryAPIConverter.java
@@ -178,7 +178,7 @@
         || definition.isLibraryMethodOverride().isFalse()) {
       return false;
     }
-    if (!appView.rewritePrefix.hasRewrittenTypeInSignature(definition.proto(), appView)
+    if (!appView.rewritePrefix.hasRewrittenTypeInSignature(definition.getProto(), appView)
         || appView
             .options()
             .desugaredLibraryConfiguration

src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java
index f2f70ca..10a50ca 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java
@@ -120,9 +120,9 @@
   }
 
   private DexEncodedMethod fixupEncodedMethod(DexEncodedMethod method) {
-    DexProto oldProto = method.proto();
+    DexProto oldProto = method.getProto();
     DexProto newProto = fixupProto(oldProto);
-    if (newProto == method.proto()) {
+    if (newProto == method.getProto()) {
       return method;
     }
     assert !method.isClassInitializer();