| commit | ff08464c7250505223ff73e4d752e06c52ee72a0 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Wed Apr 15 08:48:18 2020 +0200 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Wed Apr 15 07:05:50 2020 +0000 |
| tree | 186c1e4b3da751daeb12fe7ea337df5b43e6063f | |
| parent | c1e18d6736926bf79a9175af65aead884250f069 [diff] |
Temporarily disable redundant field load elimination for code with >=20000 blocks Bug: 154064966 Change-Id: I0516f41a26471aacf1cebffa6c2d20ef3519faa7
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadElimination.java b/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadElimination.java index 4b50b6e..e25949d 100644 --- a/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadElimination.java +++ b/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadElimination.java
@@ -72,7 +72,9 @@ public static boolean shouldRun(AppView<?> appView, IRCode code) { return appView.options().enableRedundantFieldLoadElimination - && (code.metadata().mayHaveFieldGet() || code.metadata().mayHaveInitClass()); + && (code.metadata().mayHaveFieldGet() || code.metadata().mayHaveInitClass()) + // TODO(b/154064966): Remove workaround. + && code.blocks.size() < 20000; } private interface FieldValue {