diff options
| author | 2014-08-07 21:38:15 +0000 | |
|---|---|---|
| committer | 2014-08-07 15:46:11 +0000 | |
| commit | 52fed5a8f31dac64d09ede03703f40b712a7d766 (patch) | |
| tree | 1633f7bc4d641473bf904231826b63707f87c516 /compiler/dex/quick/codegen_util.cc | |
| parent | 01fc4ee8d8194d926cde02d7b6b6001c811c1c2b (diff) | |
| parent | 547cdfd21ee21e4ab9ca8692d6ef47c62ee7ea52 (diff) | |
Merge "Emit CFI for x86 & x86_64 JNI compiler."
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 511297c713..be79b63931 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -1085,7 +1085,7 @@ CompiledMethod* Mir2Lir::GetCompiledMethod() { vmap_encoder.PushBackUnsigned(0u); // Size is 0. } - std::unique_ptr<std::vector<uint8_t>> cfi_info(ReturnCallFrameInformation()); + std::unique_ptr<std::vector<uint8_t>> cfi_info(ReturnFrameDescriptionEntry()); CompiledMethod* result = new CompiledMethod(cu_->compiler_driver, cu_->instruction_set, code_buffer_, frame_size_, core_spill_mask_, fp_spill_mask_, encoded_mapping_table_, @@ -1250,7 +1250,7 @@ void Mir2Lir::LoadClassType(const DexFile& dex_file, uint32_t type_idx, AppendLIR(load_pc_rel); } -std::vector<uint8_t>* Mir2Lir::ReturnCallFrameInformation() { +std::vector<uint8_t>* Mir2Lir::ReturnFrameDescriptionEntry() { // Default case is to do nothing. return nullptr; } |