diff options
| author | 2017-09-21 15:37:55 +0000 | |
|---|---|---|
| committer | 2017-09-21 15:37:55 +0000 | |
| commit | 20e9a7f4ac3b61c1a81653276036e124b19cb8d4 (patch) | |
| tree | 0108a2cff437d5f272be78edddfe7f01f8dce2ae /compiler/compiled_method.cc | |
| parent | 1d9f45b5f5e48ffb48ddca3a560bf33fe420b015 (diff) | |
| parent | d8dbc8da0e5cc6b5c2176ce2d3877e6194d72c0c (diff) | |
Merge "Refactor compiled_method.h ."
Diffstat (limited to 'compiler/compiled_method.cc')
| -rw-r--r-- | compiler/compiled_method.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc index 0d9021fcfb..111469fe89 100644 --- a/compiler/compiled_method.cc +++ b/compiler/compiled_method.cc @@ -22,7 +22,8 @@ namespace art { -CompiledCode::CompiledCode(CompilerDriver* compiler_driver, InstructionSet instruction_set, +CompiledCode::CompiledCode(CompilerDriver* compiler_driver, + InstructionSet instruction_set, const ArrayRef<const uint8_t>& quick_code) : compiler_driver_(compiler_driver), instruction_set_(instruction_set), @@ -77,8 +78,7 @@ size_t CompiledCode::CodeDelta(InstructionSet instruction_set) { } } -const void* CompiledCode::CodePointer(const void* code_pointer, - InstructionSet instruction_set) { +const void* CompiledCode::CodePointer(const void* code_pointer, InstructionSet instruction_set) { switch (instruction_set) { case kArm: case kArm64: @@ -108,7 +108,7 @@ CompiledMethod::CompiledMethod(CompilerDriver* driver, const ArrayRef<const uint8_t>& method_info, const ArrayRef<const uint8_t>& vmap_table, const ArrayRef<const uint8_t>& cfi_info, - const ArrayRef<const LinkerPatch>& patches) + const ArrayRef<const linker::LinkerPatch>& patches) : CompiledCode(driver, instruction_set, quick_code), frame_size_in_bytes_(frame_size_in_bytes), core_spill_mask_(core_spill_mask), @@ -129,7 +129,7 @@ CompiledMethod* CompiledMethod::SwapAllocCompiledMethod( const ArrayRef<const uint8_t>& method_info, const ArrayRef<const uint8_t>& vmap_table, const ArrayRef<const uint8_t>& cfi_info, - const ArrayRef<const LinkerPatch>& patches) { + const ArrayRef<const linker::LinkerPatch>& patches) { SwapAllocator<CompiledMethod> alloc(driver->GetCompiledMethodStorage()->GetSwapSpaceAllocator()); CompiledMethod* ret = alloc.allocate(1); alloc.construct(ret, |