summaryrefslogtreecommitdiff
path: root/compiler/optimizing/optimizing_compiler.cc
diff options
context:
space:
mode:
author Aart Bik <ajcbik@google.com> 2015-11-21 05:48:15 +0000
committer android-build-merger <android-build-merger@google.com> 2015-11-21 05:48:15 +0000
commit594b4469ed2a08072c4b5db86cc229df89d0a945 (patch)
treeb192c4698c4889ae90db6abe2652199802213fe6 /compiler/optimizing/optimizing_compiler.cc
parent52e3b91163dc37d38901bae1915f44235abf8f9b (diff)
parent08a96a5a4f6c78c9639af884228d28c7fb0c30fc (diff)
Merge "Revert "Dynamic BCE (based on induction range analysis)"" am: d83b9042d6
am: 08a96a5a4f * commit '08a96a5a4f6c78c9639af884228d28c7fb0c30fc': Revert "Dynamic BCE (based on induction range analysis)"
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r--compiler/optimizing/optimizing_compiler.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 51946810ef..2204921c53 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -491,13 +491,12 @@ static void RunOptimizations(HGraph* graph,
InstructionSimplifier* simplify1 = new (arena) InstructionSimplifier(graph, stats);
HBooleanSimplifier* boolean_simplify = new (arena) HBooleanSimplifier(graph);
HConstantFolding* fold2 = new (arena) HConstantFolding(graph, "constant_folding_after_inlining");
- HConstantFolding* fold3 = new (arena) HConstantFolding(graph, "constant_folding_after_bce");
SideEffectsAnalysis* side_effects = new (arena) SideEffectsAnalysis(graph);
GVNOptimization* gvn = new (arena) GVNOptimization(graph, *side_effects);
LICM* licm = new (arena) LICM(graph, *side_effects);
LoadStoreElimination* lse = new (arena) LoadStoreElimination(graph, *side_effects);
HInductionVarAnalysis* induction = new (arena) HInductionVarAnalysis(graph);
- BoundsCheckElimination* bce = new (arena) BoundsCheckElimination(graph, *side_effects, induction);
+ BoundsCheckElimination* bce = new (arena) BoundsCheckElimination(graph, induction);
ReferenceTypePropagation* type_propagation =
new (arena) ReferenceTypePropagation(graph, &handles);
HSharpening* sharpening = new (arena) HSharpening(graph, codegen, dex_compilation_unit, driver);
@@ -550,7 +549,6 @@ static void RunOptimizations(HGraph* graph,
licm,
induction,
bce,
- fold3, // evaluates code generated by dynamic bce
simplify3,
lse,
dce2,