diff options
| author | 2014-08-15 23:27:29 +0000 | |
|---|---|---|
| committer | 2014-08-15 18:44:51 +0000 | |
| commit | aa1ed01d119ee6d93e6254789c79246e91fcec32 (patch) | |
| tree | 90a1afdaa989959e788a2f596fd4278629cdc579 /compiler/optimizing/optimizing_compiler.cc | |
| parent | c28d8a6f0fbfbec8993854b1a9be08af7d506e7b (diff) | |
| parent | e3ea83811d47152c00abea24a9b420651a33b496 (diff) | |
Merge "ART source line debug info in OAT files"
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 8a5077b962..fce6ab0a33 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -161,7 +161,10 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite } std::vector<uint8_t> mapping_table; - codegen->BuildMappingTable(&mapping_table); + SrcMap src_mapping_table; + codegen->BuildMappingTable(&mapping_table, + GetCompilerDriver()->GetCompilerOptions().GetIncludeDebugSymbols() ? + &src_mapping_table : nullptr); std::vector<uint8_t> vmap_table; codegen->BuildVMapTable(&vmap_table); std::vector<uint8_t> gc_map; @@ -173,6 +176,7 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite codegen->GetFrameSize(), codegen->GetCoreSpillMask(), 0, /* FPR spill mask, unused */ + &src_mapping_table, mapping_table, vmap_table, gc_map, |