summaryrefslogtreecommitdiffstats
path: root/compiler/optimizing
diff options
context:
space:
mode:
authorDavid Srbecky <dsrbecky@google.com>2015-06-19 18:25:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-19 18:26:45 +0000
commitdb538d309bc34e025e921a04f10b4ee745bd9f1d (patch)
tree9ff4d516df8d23a62bdb2a573575b31df00c5237 /compiler/optimizing
parent3e91a44bc9063f7f69b5415e3cf162991f73283f (diff)
parenta26cb57f46fd3f27a930d9d688fe8670c1f24754 (diff)
downloadandroid_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/optimizing')
-rw-r--r--compiler/optimizing/optimizing_compiler.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index c7b2c67019..5632434c0f 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -404,7 +404,7 @@ CompiledMethod* OptimizingCompiler::CompileOptimized(HGraph* graph,
codegen->CompileOptimized(&allocator);
DefaultSrcMap src_mapping_table;
- if (compiler_driver->GetCompilerOptions().GetIncludeDebugSymbols()) {
+ if (compiler_driver->GetCompilerOptions().GetGenerateDebugInfo()) {
codegen->BuildSourceMap(&src_mapping_table);
}
@@ -441,7 +441,7 @@ CompiledMethod* OptimizingCompiler::CompileBaseline(
std::vector<uint8_t> mapping_table;
codegen->BuildMappingTable(&mapping_table);
DefaultSrcMap src_mapping_table;
- if (compiler_driver->GetCompilerOptions().GetIncludeDebugSymbols()) {
+ if (compiler_driver->GetCompilerOptions().GetGenerateDebugInfo()) {
codegen->BuildSourceMap(&src_mapping_table);
}
std::vector<uint8_t> vmap_table;
@@ -533,7 +533,7 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite
return nullptr;
}
codegen->GetAssembler()->cfi().SetEnabled(
- compiler_driver->GetCompilerOptions().GetIncludeCFI());
+ compiler_driver->GetCompilerOptions().GetGenerateDebugInfo());
PassInfoPrinter pass_info_printer(graph,
method_name.c_str(),