summaryrefslogtreecommitdiff
path: root/compiler/optimizing/optimizing_compiler.cc
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-08-26 16:19:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-08-26 16:19:59 +0000
commitcc55a7ce2aa0f10c2da9efaa89855cf075e56e20 (patch)
tree9bf090506ab95337f9029be4e4c8453b7d01a488 /compiler/optimizing/optimizing_compiler.cc
parentc9c055f96005b319d6c582b23432ba3ef0bd7488 (diff)
parent68c981fad87720fae9c799b240141ce3c12cd5bf (diff)
Merge "ARM/MIPS: Avoid dead dex cache arrays base for intrinsics."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r--compiler/optimizing/optimizing_compiler.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index f7c325ed93..6e98b4d54e 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -490,7 +490,7 @@ static HOptimization* BuildOptimization(
return new (arena) SideEffectsAnalysis(graph);
#ifdef ART_ENABLE_CODEGEN_arm
} else if (opt_name == arm::DexCacheArrayFixups::kDexCacheArrayFixupsArmPassName) {
- return new (arena) arm::DexCacheArrayFixups(graph, stats);
+ return new (arena) arm::DexCacheArrayFixups(graph, codegen, stats);
} else if (opt_name == arm::InstructionSimplifierArm::kInstructionSimplifierArmPassName) {
return new (arena) arm::InstructionSimplifierArm(graph, stats);
#endif
@@ -604,7 +604,8 @@ void OptimizingCompiler::RunArchOptimizations(InstructionSet instruction_set,
#ifdef ART_ENABLE_CODEGEN_arm
case kThumb2:
case kArm: {
- arm::DexCacheArrayFixups* fixups = new (arena) arm::DexCacheArrayFixups(graph, stats);
+ arm::DexCacheArrayFixups* fixups =
+ new (arena) arm::DexCacheArrayFixups(graph, codegen, stats);
arm::InstructionSimplifierArm* simplifier =
new (arena) arm::InstructionSimplifierArm(graph, stats);
SideEffectsAnalysis* side_effects = new (arena) SideEffectsAnalysis(graph);