diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-04-02 21:25:21 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2015-04-02 21:36:48 +0100 |
| commit | b207e1473dda1730604a28db2b4fa52f2998aeae (patch) | |
| tree | f11edd5afaab57f733f18cc6cba66cf84d8a6571 /compiler/compiled_method.cc | |
| parent | 3795e94a8bd42a1de3a98935f45399f1805a9f6e (diff) | |
| download | art-b207e1473dda1730604a28db2b4fa52f2998aeae.tar.gz art-b207e1473dda1730604a28db2b4fa52f2998aeae.tar.bz2 art-b207e1473dda1730604a28db2b4fa52f2998aeae.zip | |
Pass linker patches around as const.
Change-Id: I0eabd713d29475db9eb6e186f331dbfb00e0cf6b
Diffstat (limited to 'compiler/compiled_method.cc')
| -rw-r--r-- | compiler/compiled_method.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc index 03370db6c0..eeed877444 100644 --- a/compiler/compiled_method.cc +++ b/compiler/compiled_method.cc @@ -132,7 +132,7 @@ CompiledMethod::CompiledMethod(CompilerDriver* driver, const ArrayRef<const uint8_t>& vmap_table, const ArrayRef<const uint8_t>& native_gc_map, const ArrayRef<const uint8_t>& cfi_info, - const ArrayRef<LinkerPatch>& patches) + const ArrayRef<const LinkerPatch>& patches) : CompiledCode(driver, instruction_set, quick_code, !driver->DedupeEnabled()), owns_arrays_(!driver->DedupeEnabled()), frame_size_in_bytes_(frame_size_in_bytes), core_spill_mask_(core_spill_mask), @@ -179,7 +179,7 @@ CompiledMethod* CompiledMethod::SwapAllocCompiledMethod( const ArrayRef<const uint8_t>& vmap_table, const ArrayRef<const uint8_t>& native_gc_map, const ArrayRef<const uint8_t>& cfi_info, - const ArrayRef<LinkerPatch>& patches) { + const ArrayRef<const LinkerPatch>& patches) { SwapAllocator<CompiledMethod> alloc(driver->GetSwapSpaceAllocator()); CompiledMethod* ret = alloc.allocate(1); alloc.construct(ret, driver, instruction_set, quick_code, frame_size_in_bytes, core_spill_mask, @@ -200,7 +200,8 @@ CompiledMethod* CompiledMethod::SwapAllocCompiledMethodStackMap( CompiledMethod* ret = alloc.allocate(1); alloc.construct(ret, driver, instruction_set, quick_code, frame_size_in_bytes, core_spill_mask, fp_spill_mask, nullptr, ArrayRef<const uint8_t>(), stack_map, - ArrayRef<const uint8_t>(), ArrayRef<const uint8_t>(), ArrayRef<LinkerPatch>()); + ArrayRef<const uint8_t>(), ArrayRef<const uint8_t>(), + ArrayRef<const LinkerPatch>()); return ret; } @@ -217,7 +218,7 @@ CompiledMethod* CompiledMethod::SwapAllocCompiledMethodCFI( alloc.construct(ret, driver, instruction_set, quick_code, frame_size_in_bytes, core_spill_mask, fp_spill_mask, nullptr, ArrayRef<const uint8_t>(), ArrayRef<const uint8_t>(), ArrayRef<const uint8_t>(), - cfi_info, ArrayRef<LinkerPatch>()); + cfi_info, ArrayRef<const LinkerPatch>()); return ret; } |