Commit d10e5d85 authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

Roll r8 1.6.11 -> 1.6.19 with inlining optimizations on

Change-Id: I61cab72b4c197af008012fc73eedaae4cffaaf11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1733579
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684360}
parent 32a0b159
...@@ -1277,7 +1277,7 @@ deps = { ...@@ -1277,7 +1277,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/r8', 'package': 'chromium/third_party/r8',
'version': '1ceH-5pheRe3OUeFz4TzVc2xcu6sm45yeFQBTT4rd6IC', 'version': '6mmxCrRGY15GNu1r-XmGVxohZfruF6_XjiKSCZakkN4C',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
......
Name: R8 Name: R8
URL: https://r8.googlesource.com/r8 URL: https://r8.googlesource.com/r8
Revision: 09516867c67b961f861308bceec63243b5cb7d1a Revision: 49dbca6424489d4320727bbd731175a310d7aa35
Version: 1.6.11-dev Version: 1.6.19-dev
License: BSD 3-Clause License: BSD 3-Clause
License File: NOT_SHIPPED License File: NOT_SHIPPED
Security Critical: no Security Critical: no
...@@ -15,9 +15,6 @@ Turning off vertical and horizontal class merging, as described in ...@@ -15,9 +15,6 @@ Turning off vertical and horizontal class merging, as described in
https://issuetracker.google.com/122902374#comment11. We should no longer make https://issuetracker.google.com/122902374#comment11. We should no longer make
this modification once the linked bug is fixed. this modification once the linked bug is fixed.
Turning off nullable inlining since it caused a performance regression here:
crbug.com/965189. If R8 ever mitigates this, we can re-enable this.
Turning off outlining because it caused issues when synchronized proguarding Turning off outlining because it caused issues when synchronized proguarding
Trichrome due to illegal dex references (crbug.com/956839). Will only be used Trichrome due to illegal dex references (crbug.com/956839). Will only be used
for android_apk() targets that set `disable_r8_outlining = true`): for android_apk() targets that set `disable_r8_outlining = true`):
......
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java 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 2e1a254fd..d4b2b7e16 100644 index 7e788e156..959d31348 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java --- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java +++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -161,8 +161,8 @@ public class InternalOptions { @@ -168,8 +168,8 @@ public class InternalOptions {
// Optimization-related flags. These should conform to -dontoptimize and disableAllOptimizations. // Optimization-related flags. These should conform to -dontoptimize and disableAllOptimizations.
public boolean enableDynamicTypeOptimization = true; public boolean enableDynamicTypeOptimization = true;
- public boolean enableHorizontalClassMerging = true; - public boolean enableHorizontalClassMerging = true;
...@@ -13,21 +13,10 @@ index 2e1a254fd..d4b2b7e16 100644 ...@@ -13,21 +13,10 @@ index 2e1a254fd..d4b2b7e16 100644
public boolean enableArgumentRemoval = true; public boolean enableArgumentRemoval = true;
public boolean enableUnusedArgumentRemoval = true; public boolean enableUnusedArgumentRemoval = true;
public boolean enableUnusedInterfaceRemoval = true; public boolean enableUnusedInterfaceRemoval = true;
@@ -173,9 +173,7 @@ public class InternalOptions { @@ -901,7 +901,7 @@ public class InternalOptions {
public boolean enableInliningOfInvokesWithDefinitelyNullReceivers =
System.getProperty("com.android.tools.r8.disableInliningOfInvokesWithDefinitelyNullReceivers")
== null;
- public boolean enableInliningOfInvokesWithNullableReceivers =
- System.getProperty("com.android.tools.r8.disableInliningOfInvokesWithNullableReceivers")
- == null;
+ public boolean enableInliningOfInvokesWithNullableReceivers = false;
public boolean enableClassInlining = true;
public boolean enableClassStaticizer = true;
public boolean enableInitializedClassesAnalysis = true;
@@ -868,7 +866,7 @@ public class InternalOptions {
public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport"; public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport";
public static final String METHOD_PREFIX = "outline"; public static final String METHOD_PREFIX = "outline";
- public boolean enabled = true; - public boolean enabled = true;
+ public boolean enabled = System.getProperty("com.android.tools.r8.disableOutlining") == null; + public boolean enabled = System.getProperty("com.android.tools.r8.disableOutlining") == null;
public int minSize = 3; public int minSize = 3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment