Commit 1dd96a5f authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

Rolling r8 1.7.13 -> 2.0.2

We no longer need the callGraphCycleEliminatorMaxDepthThreshold, since R8 fixed
this issue (see b/143685705).

Change-Id: Ibd9ad9c3ca3d7c7365c7475ff9435cc39fc9774c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1928047
Auto-Submit: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717669}
parent d27bf911
......@@ -1396,7 +1396,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/r8',
'version': '7iz_2pdTN2RZRzgoVnxCi1Ro0iUSsEsvXGgmBgXG6z4C',
'version': '-oXGY8FjY2ZuIBHoGAByn8N6Vn2b0wB2QO8Ct_169XoC',
},
],
'condition': 'checkout_android',
......
Name: R8
URL: https://r8.googlesource.com/r8
Revision: f016f7d670c7afe027d48b4c053a455bb81c0733
Version: 1.7.13-dev
Revision: 5cca4af33d246f51b49650d7480493247947eda9
Version: 2.0.2-dev
License: BSD 3-Clause
License File: NOT_SHIPPED
Security Critical: no
......
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 89aeb2da4..145f13c05 100644
index 595ac28da..e96f06364 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -189,8 +189,8 @@ public class InternalOptions {
@@ -194,8 +194,8 @@ public class InternalOptions {
public boolean enableDynamicTypeOptimization = true;
public boolean enableFieldBitAccessAnalysis =
System.getProperty("com.android.tools.r8.fieldBitAccessAnalysis") != null;
......@@ -13,19 +13,10 @@ index 89aeb2da4..145f13c05 100644
public boolean enableArgumentRemoval = true;
public boolean enableUnusedArgumentRemoval = true;
public boolean enableUnusedInterfaceRemoval = true;
@@ -217,7 +217,7 @@ public class InternalOptions {
// exceeds the threshold, we treat it as if we have found a cycle. This ensures that we won't run
// into stack overflows when the call graph contains large call chains. This should have a
// negligible impact on code size as long as the threshold is large enough.
- public int callGraphCycleEliminatorMaxDepthThreshold = 256;
+ public int callGraphCycleEliminatorMaxDepthThreshold = Integer.MAX_VALUE;
public int callGraphLikelySpuriousCallEdgeThreshold = 50;
public int classInliningInstructionLimit = 50;
@@ -910,7 +910,7 @@ public class InternalOptions {
@@ -919,7 +919,7 @@ public class InternalOptions {
public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport";
public static final String METHOD_PREFIX = "outline";
- public boolean enabled = true;
+ public boolean enabled = System.getProperty("com.android.tools.r8.disableOutlining") == null;
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