summaryrefslogtreecommitdiff
path: root/compiler/optimizing/optimizing_compiler.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-12-06 10:12:17 +0000
committer android-build-merger <android-build-merger@google.com> 2016-12-06 10:12:17 +0000
commite9bc82959ce3a673c16446f70b4fdbc11964d7df (patch)
tree00912676b1fa9be93f0bdadeba97a8e548a46d58 /compiler/optimizing/optimizing_compiler.cc
parent3a9cc4b5e5dd3e5ebe1e40b3e3696f7d618edb61 (diff)
parent5677d9a8154ebff246b6c6ce4ef64707a3368ed8 (diff)
Merge "ARM: VIXL32: Implement Invoke, LoadClass, LoadString dispatch."
am: 5677d9a815 Change-Id: Ife1ac1c4a4fd33bac190911e3f2694d0e4214ebf
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r--compiler/optimizing/optimizing_compiler.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index e15e33dc78..8ea2b06530 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -630,10 +630,8 @@ void OptimizingCompiler::RunArchOptimizations(InstructionSet instruction_set,
#if defined(ART_ENABLE_CODEGEN_arm)
case kThumb2:
case kArm: {
-#ifndef ART_USE_VIXL_ARM_BACKEND
arm::DexCacheArrayFixups* fixups =
new (arena) arm::DexCacheArrayFixups(graph, codegen, stats);
-#endif
arm::InstructionSimplifierArm* simplifier =
new (arena) arm::InstructionSimplifierArm(graph, stats);
SideEffectsAnalysis* side_effects = new (arena) SideEffectsAnalysis(graph);
@@ -642,9 +640,7 @@ void OptimizingCompiler::RunArchOptimizations(InstructionSet instruction_set,
simplifier,
side_effects,
gvn,
-#ifndef ART_USE_VIXL_ARM_BACKEND
fixups
-#endif
};
RunOptimizations(arm_optimizations, arraysize(arm_optimizations), pass_observer);
break;