From f6669d6df42686aea832762f701359a3f9bdc762 Mon Sep 17 00:00:00 2001 From: Sterling Augustine Date: Fri, 2 Oct 2020 07:44:24 -0700 Subject: Revert "Refactor rangelist handling to prepare for dwarf5 .debug_rngslist" This reverts commit 2b936b06c12657b684f6c7276d6ae5a24cb48ab5. After getting deep into the dwarf5 range reader, I realized that this should be done a somewhat different way. So reverting in favor or a better design, coming in a few minutes. Change-Id: Ie0b2846e70b3df1e637831e96ea69fe093f4e712 Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2446011 Reviewed-by: Mark Mentovai --- src/common/dwarf_cu_to_module.cc | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/common/dwarf_cu_to_module.cc') diff --git a/src/common/dwarf_cu_to_module.cc b/src/common/dwarf_cu_to_module.cc index 589f8bb2..a5bc7d6c 100644 --- a/src/common/dwarf_cu_to_module.cc +++ b/src/common/dwarf_cu_to_module.cc @@ -134,7 +134,6 @@ DwarfCUToModule::FileContext::FileContext(const string& filename, : filename_(filename), module_(module), handle_inter_cu_refs_(handle_inter_cu_refs), - range_list_reader_(nullptr, 0, nullptr), file_private_(new FilePrivate()) { } @@ -194,7 +193,7 @@ struct DwarfCUToModule::CUContext { // For printing error messages. WarningReporter* reporter; - // For handling ranges, however they may be specified. + // For reading ranges from the .debug_ranges section RangesHandler* ranges_handler; // The source language of this compilation unit. @@ -207,9 +206,6 @@ struct DwarfCUToModule::CUContext { uint64_t high_pc; uint64_t ranges; - // For reading dwarf4 ranges. - scoped_ptr range_list_reader_; - // The functions defined in this compilation unit. We accumulate // them here during parsing. Then, in DwarfCUToModule::Finish, we // assign them lines and add them to file_context->module. @@ -516,15 +512,6 @@ void DwarfCUToModule::FuncHandler::ProcessAttributeUnsigned( break; case dwarf2reader::DW_AT_ranges: ranges_ = data; - if (cu_context_->ranges_handler) { - cu_context_->ranges_handler->SetRangesReader( - &cu_context_->file_context->range_list_reader_); - } else { - cu_context_->reporter->MissingRanges(); - // The rest of the code will fall back to low-pc, which is better than - // nothing. - ranges_ = 0; - } break; default: -- cgit v1.2.1