commit 77b2962e73aa8436d0ca93b8ff4942c288135686
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Nov 20 12:25:08 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Nov 20 11:42:00 2019 +0000
tree f7a38a11afc071c2d53eee8318af3bafbf696cdc
parent fce9617b87d81093135f3b99ad3b43cf8b15cde8

Minor cleanup in ProtoInliningReasonStrategy

Change-Id: I77003a2e150f98b180478111de48d8b13465b09f

src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoInliningReasonStrategy.java

diff --git a/src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoInliningReasonStrategy.java b/src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoInliningReasonStrategy.java
index 8585c08..4d04a73 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoInliningReasonStrategy.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoInliningReasonStrategy.java
@@ -54,16 +54,12 @@
 
     DexField field = methodToInvokeDefinition.asStaticGet().getField();
     MethodToInvokeMembers methodToInvokeMembers = references.methodToInvokeMembers;
-    if (field == methodToInvokeMembers.getDefaultInstanceField
-        || field == methodToInvokeMembers.getMemoizedIsInitializedField
-        || field == methodToInvokeMembers.newBuilderField
-        || field == methodToInvokeMembers.newMutableInstanceField
-        || field == methodToInvokeMembers.setMemoizedIsInitializedField) {
+    if (methodToInvokeMembers.isMethodToInvokeWithSimpleBody(field)) {
       return Reason.ALWAYS;
     }
 
     assert field.holder != references.methodToInvokeType
-        || methodToInvokeMembers.isKnownMethodToInvoke(field);
+        || methodToInvokeMembers.isMethodToInvokeWithNonSimpleBody(field);
 
     return Reason.NEVER;
   }

src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoReferences.java

diff --git a/src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoReferences.java b/src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoReferences.java
index e8967b4..cedb6ed 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoReferences.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/proto/ProtoReferences.java
@@ -175,15 +175,16 @@
               methodToInvokeType, methodToInvokeType, "SET_MEMOIZED_IS_INITIALIZED");
     }
 
-    public boolean isKnownMethodToInvoke(DexField field) {
-      assert field.holder == methodToInvokeType;
-      return field == buildMessageInfoField
-          || field == getDefaultInstanceField
+    public boolean isMethodToInvokeWithSimpleBody(DexField field) {
+      return field == getDefaultInstanceField
           || field == getMemoizedIsInitializedField
-          || field == getParserField
           || field == newBuilderField
           || field == newMutableInstanceField
           || field == setMemoizedIsInitializedField;
     }
+
+    public boolean isMethodToInvokeWithNonSimpleBody(DexField field) {
+      return field == buildMessageInfoField || field == getParserField;
+    }
   }
 }