commit 6862062fdc11eb7e58c8002842f956be8f4d0bb8
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Sep 16 13:12:04 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Sep 16 13:12:04 2021 +0200
tree 72b616b57cddfd543a292862310608a2e9d13394
parent 01343f8a9bf0c06ddf7c9b11b7221aa9a9580f02

Support for setting optimization info for synthesized methods

Change-Id: I1b24de0bbc5630497f341891026a914a340c505b

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 b4a382f..82f09f8 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -1675,6 +1675,11 @@
       return this;
     }
 
+    public Builder setOptimizationInfo(MethodOptimizationInfo optimizationInfo) {
+      this.optimizationInfo = optimizationInfo;
+      return this;
+    }
+
     public Builder modifyOptimizationInfo(
         BiConsumer<DexEncodedMethod, MutableMethodOptimizationInfo> consumer) {
       return addBuildConsumer(

src/main/java/com/android/tools/r8/synthesis/SyntheticMethodBuilder.java

diff --git a/src/main/java/com/android/tools/r8/synthesis/SyntheticMethodBuilder.java b/src/main/java/com/android/tools/r8/synthesis/SyntheticMethodBuilder.java
index d81a03f..56a9d20 100644
--- a/src/main/java/com/android/tools/r8/synthesis/SyntheticMethodBuilder.java
+++ b/src/main/java/com/android/tools/r8/synthesis/SyntheticMethodBuilder.java
@@ -17,6 +17,8 @@
 import com.android.tools.r8.graph.GenericSignature.MethodTypeSignature;
 import com.android.tools.r8.graph.MethodAccessFlags;
 import com.android.tools.r8.graph.ParameterAnnotationsList;
+import com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo;
+import com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo;
 import com.android.tools.r8.synthesis.SyntheticNaming.SyntheticKind;
 import com.android.tools.r8.utils.AndroidApiLevel;
 
@@ -39,6 +41,7 @@
   private ParameterAnnotationsList parameterAnnotationsList = ParameterAnnotationsList.empty();
   private AndroidApiLevel apiLevelForDefinition = NOT_SET;
   private AndroidApiLevel apiLevelForCode = NOT_SET;
+  private MethodOptimizationInfo optimizationInfo = DefaultMethodOptimizationInfo.getInstance();
 
   private boolean checkAndroidApiLevels = true;
 
@@ -65,6 +68,11 @@
     return this;
   }
 
+  public SyntheticMethodBuilder setOptimizationInfo(MethodOptimizationInfo optimizationInfo) {
+    this.optimizationInfo = optimizationInfo;
+    return this;
+  }
+
   public SyntheticMethodBuilder setProto(DexProto proto) {
     this.proto = proto;
     return this;
@@ -132,6 +140,7 @@
             .setClassFileVersion(classFileVersion)
             .setApiLevelForDefinition(apiLevelForDefinition)
             .setApiLevelForCode(apiLevelForCode)
+            .setOptimizationInfo(optimizationInfo)
             .applyIf(!checkAndroidApiLevels, DexEncodedMethod.Builder::disableAndroidApiLevelCheck)
             .build();
     assert isValidSyntheticMethod(method, syntheticKind);