diff options
| author | 2015-03-04 23:00:18 +0000 | |
|---|---|---|
| committer | 2015-03-04 23:00:19 +0000 | |
| commit | 18cd8711d0059415dc8a99470fc105279a9ce0c6 (patch) | |
| tree | 47dadafacc0ba3c56293713cfb6f43606ea959b9 /compiler/dex/quick/codegen_util.cc | |
| parent | b8fef11aef3732f97ef9192e14c49d4993c26e22 (diff) | |
| parent | d37f91902048b23ad5fe5b20aba0ebc92e0b4896 (diff) | |
Merge "ART: Do not produce CFI when not asked for"
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 0be9fd4781..0bac511dd1 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -1067,7 +1067,10 @@ CompiledMethod* Mir2Lir::GetCompiledMethod() { return lhs.LiteralOffset() < rhs.LiteralOffset(); }); - std::unique_ptr<std::vector<uint8_t>> cfi_info(ReturnFrameDescriptionEntry()); + std::unique_ptr<std::vector<uint8_t>> cfi_info( + cu_->compiler_driver->GetCompilerOptions().GetGenerateGDBInformation() ? + ReturnFrameDescriptionEntry() : + nullptr); ArrayRef<const uint8_t> cfi_ref; if (cfi_info.get() != nullptr) { cfi_ref = ArrayRef<const uint8_t>(*cfi_info); |