diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-11-12 15:20:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-12 15:20:08 +0000 |
| commit | cff81076cbb4bbe3841942f14326f4401fa3c8df (patch) | |
| tree | f0a85a6059ff289ccb4b6e43b2b9b3924d481a31 /compiler/optimizing/optimizing_compiler.cc | |
| parent | fe0ec35c68d57205bd8fe13bd195ae0b5a3ed180 (diff) | |
| parent | 0f7dca4ca0be8d2f8776794d35edf8b51b5bc997 (diff) | |
Merge "Optimizing/X86: PC-relative dex cache array addressing."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 368a30e4b1..2be0680561 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -24,7 +24,7 @@ #endif #ifdef ART_ENABLE_CODEGEN_x86 -#include "constant_area_fixups_x86.h" +#include "pc_relative_fixups_x86.h" #endif #include "art_method-inl.h" @@ -435,10 +435,9 @@ static void RunArchOptimizations(InstructionSet instruction_set, #endif #ifdef ART_ENABLE_CODEGEN_x86 case kX86: { - x86::ConstantAreaFixups* constant_area_fixups = - new (arena) x86::ConstantAreaFixups(graph, stats); + x86::PcRelativeFixups* pc_relative_fixups = new (arena) x86::PcRelativeFixups(graph, stats); HOptimization* x86_optimizations[] = { - constant_area_fixups + pc_relative_fixups }; RunOptimizations(x86_optimizations, arraysize(x86_optimizations), pass_observer); break; |