diff options
Diffstat (limited to 'compiler/compiled_method.cc')
| -rw-r--r-- | compiler/compiled_method.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc index f6d724ab56..d884bc0ef8 100644 --- a/compiler/compiled_method.cc +++ b/compiler/compiled_method.cc @@ -153,12 +153,14 @@ CompiledMethod::CompiledMethod(CompilerDriver& driver, const uint32_t fp_spill_mask, const std::vector<uint8_t>& mapping_table, const std::vector<uint8_t>& vmap_table, - const std::vector<uint8_t>& native_gc_map) + const std::vector<uint8_t>& native_gc_map, + const std::vector<uint8_t>* cfi_info) : CompiledCode(&driver, instruction_set, quick_code), frame_size_in_bytes_(frame_size_in_bytes), core_spill_mask_(core_spill_mask), fp_spill_mask_(fp_spill_mask), mapping_table_(driver.DeduplicateMappingTable(mapping_table)), vmap_table_(driver.DeduplicateVMapTable(vmap_table)), - gc_map_(driver.DeduplicateGCMap(native_gc_map)) { + gc_map_(driver.DeduplicateGCMap(native_gc_map)), + cfi_info_(driver.DeduplicateCFIInfo(cfi_info)) { } CompiledMethod::CompiledMethod(CompilerDriver& driver, @@ -169,10 +171,11 @@ CompiledMethod::CompiledMethod(CompilerDriver& driver, const uint32_t fp_spill_mask) : CompiledCode(&driver, instruction_set, code), frame_size_in_bytes_(frame_size_in_bytes), - core_spill_mask_(core_spill_mask), fp_spill_mask_(fp_spill_mask) { - mapping_table_ = driver.DeduplicateMappingTable(std::vector<uint8_t>()); - vmap_table_ = driver.DeduplicateVMapTable(std::vector<uint8_t>()); - gc_map_ = driver.DeduplicateGCMap(std::vector<uint8_t>()); + core_spill_mask_(core_spill_mask), fp_spill_mask_(fp_spill_mask), + mapping_table_(driver.DeduplicateMappingTable(std::vector<uint8_t>())), + vmap_table_(driver.DeduplicateVMapTable(std::vector<uint8_t>())), + gc_map_(driver.DeduplicateGCMap(std::vector<uint8_t>())), + cfi_info_(nullptr) { } // Constructs a CompiledMethod for the Portable compiler. |