diff options
author | David Srbecky <dsrbecky@google.com> | 2015-06-19 18:25:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-19 18:26:45 +0000 |
commit | db538d309bc34e025e921a04f10b4ee745bd9f1d (patch) | |
tree | 9ff4d516df8d23a62bdb2a573575b31df00c5237 /compiler/dex/quick/codegen_util.cc | |
parent | 3e91a44bc9063f7f69b5415e3cf162991f73283f (diff) | |
parent | a26cb57f46fd3f27a930d9d688fe8670c1f24754 (diff) | |
download | android_art-db538d309bc34e025e921a04f10b4ee745bd9f1d.tar.gz android_art-db538d309bc34e025e921a04f10b4ee745bd9f1d.tar.bz2 android_art-db538d309bc34e025e921a04f10b4ee745bd9f1d.zip |
Merge "ART stack unwinding fixes for libunwind/gdb/lldb." into mnc-dev
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 f4bf31fb8a..c803e6588c 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -670,7 +670,7 @@ bool Mir2Lir::VerifyCatchEntries() { void Mir2Lir::CreateMappingTables() { - bool generate_src_map = cu_->compiler_driver->GetCompilerOptions().GetIncludeDebugSymbols(); + bool generate_src_map = cu_->compiler_driver->GetCompilerOptions().GetGenerateDebugInfo(); uint32_t pc2dex_data_size = 0u; uint32_t pc2dex_entries = 0u; @@ -1071,7 +1071,7 @@ Mir2Lir::Mir2Lir(CompilationUnit* cu, MIRGraph* mir_graph, ArenaAllocator* arena pc_rel_temp_(nullptr), dex_cache_arrays_min_offset_(std::numeric_limits<uint32_t>::max()), cfi_(&last_lir_insn_, - cu->compiler_driver->GetCompilerOptions().GetIncludeCFI(), + cu->compiler_driver->GetCompilerOptions().GetGenerateDebugInfo(), arena), in_to_reg_storage_mapping_(arena) { switch_tables_.reserve(4); |