diff options
| author | Vladimir Marko <vmarko@google.com> | 2017-09-20 13:37:47 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2017-09-20 15:55:10 +0100 |
| commit | d8dbc8da0e5cc6b5c2176ce2d3877e6194d72c0c (patch) | |
| tree | af6e9fb02471d75ebdea46190a0aa3e9dbdb892d /compiler/optimizing/code_generator_x86.h | |
| parent | 93780a60090356921b844dbefdc13442c9f18b52 (diff) | |
| download | art-d8dbc8da0e5cc6b5c2176ce2d3877e6194d72c0c.tar.gz art-d8dbc8da0e5cc6b5c2176ce2d3877e6194d72c0c.tar.bz2 art-d8dbc8da0e5cc6b5c2176ce2d3877e6194d72c0c.zip | |
Refactor compiled_method.h .
Move LinkerPatch to compiler/linker/linker_patch.h .
Move SrcMapElem to compiler/debug/src_map_elem.h .
Introduce compiled_method-inl.h to reduce the number
of `#include`s in compiled_method.h .
Test: m test-art-host-gtest
Test: testrunner.py --host
Change-Id: Id211cdf94a63ad265bf4709f1a5e06dffbe30f64
Diffstat (limited to 'compiler/optimizing/code_generator_x86.h')
| -rw-r--r-- | compiler/optimizing/code_generator_x86.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator_x86.h b/compiler/optimizing/code_generator_x86.h index b32d57a774..e8f919d122 100644 --- a/compiler/optimizing/code_generator_x86.h +++ b/compiler/optimizing/code_generator_x86.h @@ -431,7 +431,7 @@ class CodeGeneratorX86 : public CodeGenerator { void MoveFromReturnRegister(Location trg, Primitive::Type type) OVERRIDE; // Emit linker patches. - void EmitLinkerPatches(ArenaVector<LinkerPatch>* linker_patches) OVERRIDE; + void EmitLinkerPatches(ArenaVector<linker::LinkerPatch>* linker_patches) OVERRIDE; void PatchJitRootUse(uint8_t* code, const uint8_t* roots_data, @@ -617,9 +617,9 @@ class CodeGeneratorX86 : public CodeGenerator { HX86ComputeBaseMethodAddress* method_address; }; - template <LinkerPatch (*Factory)(size_t, const DexFile*, uint32_t, uint32_t)> + template <linker::LinkerPatch (*Factory)(size_t, const DexFile*, uint32_t, uint32_t)> void EmitPcRelativeLinkerPatches(const ArenaDeque<X86PcRelativePatchInfo>& infos, - ArenaVector<LinkerPatch>* linker_patches); + ArenaVector<linker::LinkerPatch>* linker_patches); Register GetInvokeStaticOrDirectExtraParameter(HInvokeStaticOrDirect* invoke, Register temp); |