commit 6fbfbd5bba5e2bfd52178c68f7f8dfda5b808815
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Dec 03 16:23:03 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Dec 04 11:38:05 2019 +0000
tree a77d4632e9f6cdcdcb656fe62a0616f53ccdefdd
parent 037f3904a7d5ad8de739e5097f05ca75f6875f99

Remove isEligibleForClass{Inlining,Staticizing} from InstanceInitializerInfo

Change-Id: I8a3affa907a92d836c888736259c593123716137

src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
index 2f754d1..436f81b 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
@@ -722,7 +722,7 @@
         if (method.isInstanceInitializer()) {
           InstanceInitializerInfo initializerInfo =
               method.getOptimizationInfo().getInstanceInitializerInfo();
-          if (!initializerInfo.isEligibleForClassInlining()) {
+          if (initializerInfo.receiverMayEscapeOutsideConstructorChain()) {
             return null;
           }
         }
@@ -1078,7 +1078,7 @@
     }
     InstanceInitializerInfo initializerInfo =
         encodedMethod.getOptimizationInfo().getInstanceInitializerInfo();
-    return initializerInfo.isEligibleForClassInlining();
+    return initializerInfo.receiverNeverEscapesOutsideConstructorChain();
   }
 
   private boolean exemptFromInstructionLimit(DexEncodedMethod inlinee) {

src/main/java/com/android/tools/r8/ir/optimize/info/initializer/DefaultInstanceInitializerInfo.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/DefaultInstanceInitializerInfo.java b/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/DefaultInstanceInitializerInfo.java
index a75a255..e93cda7 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/DefaultInstanceInitializerInfo.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/DefaultInstanceInitializerInfo.java
@@ -29,16 +29,6 @@
   }
 
   @Override
-  public boolean isEligibleForClassInlining() {
-    return false;
-  }
-
-  @Override
-  public boolean isEligibleForClassStaticizing() {
-    return false;
-  }
-
-  @Override
   public boolean instanceFieldInitializationMayDependOnEnvironment() {
     return true;
   }

src/main/java/com/android/tools/r8/ir/optimize/info/initializer/InstanceInitializerInfo.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/InstanceInitializerInfo.java b/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/InstanceInitializerInfo.java
index 2614eb3..24cb9af 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/InstanceInitializerInfo.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/InstanceInitializerInfo.java
@@ -14,10 +14,6 @@
    */
   public abstract AbstractFieldSet readSet();
 
-  public abstract boolean isEligibleForClassInlining();
-
-  public abstract boolean isEligibleForClassStaticizing();
-
   /**
    * Returns true if one of the instance fields on the enclosing class may be initialized with a
    * value that may depend on the runtime environment by this constructor.
@@ -47,6 +43,10 @@
    */
   public abstract boolean receiverNeverEscapesOutsideConstructorChain();
 
+  public final boolean receiverMayEscapeOutsideConstructorChain() {
+    return !receiverNeverEscapesOutsideConstructorChain();
+  }
+
   public boolean isDefaultInfo() {
     return false;
   }

src/main/java/com/android/tools/r8/ir/optimize/info/initializer/NonTrivialInstanceInitializerInfo.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/NonTrivialInstanceInitializerInfo.java b/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/NonTrivialInstanceInitializerInfo.java
index 67ad395..fa41621 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/NonTrivialInstanceInitializerInfo.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/info/initializer/NonTrivialInstanceInitializerInfo.java
@@ -20,16 +20,6 @@
   }
 
   @Override
-  public boolean isEligibleForClassInlining() {
-    return true;
-  }
-
-  @Override
-  public boolean isEligibleForClassStaticizing() {
-    return true;
-  }
-
-  @Override
   public boolean instanceFieldInitializationMayDependOnEnvironment() {
     return false;
   }

src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java b/src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java
index 12992ca..e019acd 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/staticizer/StaticizingProcessor.java
@@ -27,7 +27,6 @@
 import com.android.tools.r8.ir.conversion.IRConverter;
 import com.android.tools.r8.ir.optimize.CodeRewriter;
 import com.android.tools.r8.ir.optimize.info.OptimizationFeedback;
-import com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo;
 import com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.CandidateInfo;
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.shaking.AppInfoWithLiveness;
@@ -155,9 +154,7 @@
       // fields this should guarantee that the constructor is empty.
       assert candidateClass.instanceFields().size() == 0;
       assert constructorUsed.isProcessed();
-      InstanceInitializerInfo initializerInfo =
-          constructorUsed.getOptimizationInfo().getInstanceInitializerInfo();
-      if (!initializerInfo.isEligibleForClassStaticizing()) {
+      if (constructorUsed.getOptimizationInfo().mayHaveSideEffects()) {
         it.remove();
         continue;
       }