Updating R8 to 3.0.12-dev

Change-Id: Ie743d4040a21b2f5c3bc9f92d53b738e8ee5f69b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627991
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844086}

DEPS

@@ -1391,7 +1391,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/r8',
-              'version': 'DR3nwJggFDcmTDz7P8fJQCtRLO1nxDt26czkOqhtZJ8C',
+              'version': 'F8cKQoSai0fZxFRJVRZnoWeS-oVyp53L7bpuVq9t44AC',
           },
       ],
       'condition': 'checkout_android',

third_party/r8/README.chromium

 Name: R8
 URL: https://r8.googlesource.com/r8
-Revision: 1d0cad3ec27fc88a1ca4ffc4d3d4d5d0b3f80f5b
-Version: Unknown
+Revision: 120900065d05300341e1dbd89feee4354f525468
+Version: 3.0.12-dev
 License: BSD 3-Clause
 License File: NOT_SHIPPED
 Security Critical: no

third_party/r8/patches/0001-Desugaring-Make-all-lambdas-stateless-fix-naming-sch.patch

-From 43c8250f2420c41640305d68b9d4512d69b850b0 Mon Sep 17 00:00:00 2001
+From 5a248a7f422c11f6e41e1c8684d207f3c2953b3b Mon Sep 17 00:00:00 2001
 From: Sam Maier <smaier@chromium.org>
 Date: Tue, 19 May 2020 15:55:44 -0400
 Subject: [PATCH 1/3] Desugaring: Make all lambdas stateless & fix naming
@@ -12,10 +12,10 @@ Bug: b/129997269
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java b/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
-index c9e47c259..b5b72c0ab 100644
+index a50581ee0..0d166d275 100644
 --- a/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
 +++ b/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
-@@ -130,7 +130,8 @@ public final class LambdaClass {
+@@ -134,7 +134,8 @@ public final class LambdaClass {
      // If the lambda class should match 1:1 the class it is accessed from, we
      // just add the name of this type to make lambda class name unique.
      // It also helps link the class lambda originated from in some cases.
@@ -25,7 +25,7 @@ index c9e47c259..b5b72c0ab 100644
        lambdaClassDescriptor.append(accessedFrom.getHolderType().getName()).append('$');
      }
  
-@@ -209,7 +210,7 @@ public final class LambdaClass {
+@@ -213,7 +214,7 @@ public final class LambdaClass {
    }
  
    public final boolean isStateless() {
@@ -35,5 +35,5 @@ index c9e47c259..b5b72c0ab 100644
  
    void addSynthesizedFrom(DexProgramClass clazz) {
 -- 
-2.29.2.299.gdc1121823c-goog
+2.30.0.284.gd98b1dd5eaa7-goog
 

third_party/r8/patches/0002-Command-line-flags-for-class-merging-and-outlining.patch

-From 81210f660e8b86116e7b512ae25c44c44cb1e1e7 Mon Sep 17 00:00:00 2001
+From bfb105aec6d8e20aa91f23652b148cda5d800211 Mon Sep 17 00:00:00 2001
 From: Andrew Grieve <agrieve@chromium.org>
 Date: Mon, 28 Sep 2020 15:51:32 -0400
 Subject: [PATCH 2/3] Command-line flags for class merging and outlining
@@ -8,25 +8,21 @@ Subject: [PATCH 2/3] Command-line flags for class merging and outlining
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
-index 47c084e22..a7b1fc0eb 100644
+index 985090a37..64daa52a6 100644
 --- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
 +++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
-@@ -236,11 +236,11 @@ public class InternalOptions implements GlobalKeepInfoConfiguration {
+@@ -240,8 +240,8 @@ public class InternalOptions implements GlobalKeepInfoConfiguration {
    public boolean enableFieldAssignmentTracker = true;
    public boolean enableFieldBitAccessAnalysis =
        System.getProperty("com.android.tools.r8.fieldBitAccessAnalysis") != null;
 -  public boolean enableStaticClassMerging = true;
--  public boolean enableHorizontalClassMerging = true;
-+  public boolean enableStaticClassMerging = System.getProperty("com.android.tools.r8.staticClassMerging") != null;
-+  public boolean enableHorizontalClassMerging = System.getProperty("com.android.tools.r8.horizontalClassMerging") != null;
-   public int horizontalClassMergingMaxGroupSize = 30;
-   public boolean enableHorizontalClassMergingOfKotlinLambdas = true;
 -  public boolean enableVerticalClassMerging = true;
++  public boolean enableStaticClassMerging = System.getProperty("com.android.tools.r8.staticClassMerging") != null;
 +  public boolean enableVerticalClassMerging = System.getProperty("com.android.tools.r8.verticalClassMerging") != null;
    public boolean enableArgumentRemoval = true;
    public boolean enableUnusedInterfaceRemoval = true;
    public boolean enableDevirtualization = true;
-@@ -1167,7 +1167,7 @@ public class InternalOptions implements GlobalKeepInfoConfiguration {
+@@ -1202,7 +1202,7 @@ public class InternalOptions implements GlobalKeepInfoConfiguration {
      public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport";
      public static final String METHOD_PREFIX = "outline";
  
@@ -35,6 +31,15 @@ index 47c084e22..a7b1fc0eb 100644
      public int minSize = 3;
      public int maxSize = 99;
      public int threshold = 20;
+@@ -1273,7 +1273,7 @@ public class InternalOptions implements GlobalKeepInfoConfiguration {
+ 
+   public static class HorizontalClassMergerOptions {
+ 
+-    public boolean enable = true;
++    public boolean enable = System.getProperty("com.android.tools.r8.horizontalClassMerging") != null;
+     public boolean enableConstructorMerging = true;
+     public boolean enableJavaLambdaMerging = false;
+     public boolean enableKotlinLambdaMerging = true;
 -- 
-2.29.2.299.gdc1121823c-goog
+2.30.0.284.gd98b1dd5eaa7-goog
 

third_party/r8/patches/0003-Allow-access-modification-everywhere.patch

-From eaf26704d9d5143d3cd5a8aa96ebff225bdf6747 Mon Sep 17 00:00:00 2001
+From 9d6a4562f1bdde941dcef77c311bcb9beb47313c Mon Sep 17 00:00:00 2001
 From: Andrew Grieve <agrieve@chromium.org>
 Date: Wed, 21 Oct 2020 10:59:42 -0400
 Subject: [PATCH 3/3] Allow access modification everywhere
@@ -11,10 +11,10 @@ than adding ",allowaccessmodification" to every single -keep rule.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
-index bdda13be7..7553cbfa6 100644
+index b374e5843..999fd8307 100644
 --- a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
 +++ b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
-@@ -881,7 +881,7 @@ public class AppInfoWithLiveness extends AppInfoWithClassHierarchy
+@@ -900,7 +900,7 @@ public class AppInfoWithLiveness extends AppInfoWithClassHierarchy
  
    public boolean isAccessModificationAllowed(DexReference reference) {
      assert options().getProguardConfiguration().isAccessModificationAllowed();
@@ -24,5 +24,5 @@ index bdda13be7..7553cbfa6 100644
  
    public boolean isRepackagingAllowed(DexProgramClass clazz) {
 -- 
-2.29.2.299.gdc1121823c-goog
+2.30.0.284.gd98b1dd5eaa7-goog