[binutils-gdb] Record explicit block ranges from dwarf2read.c

[Kevin Buettner <kevinb at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2d5f09ec45f81a9c89a98c4629662d812774dfd0

commit 2d5f09ec45f81a9c89a98c4629662d812774dfd0
Author: Kevin Buettner <kevinb@redhat.com>
Date:   Thu Aug 23 16:00:49 2018 -0700

    Record explicit block ranges from dwarf2read.c
    
    This change sets BLOCK_RANGES for the block under consideration by
    calling make_blockranges().  This action is performed in
    dwarf2_record_block_ranges().
    
    It should be noted that dwarf2_record_block_ranges() already does some
    recording of the range via a call to record_block_range().  The ranges
    recorded in that fashion end up in the address map associated with the
    blockvector for the compilation unit's symtab.  Given an address, the
    addrmap provides a fast way of finding the block containing that
    address.  The address map does not, however, provide a convenient way
    of determining which address ranges make up a particular block.
    
    While reading a set of ranges, a vector of pairs is used to collect
    the starting and ending addresses for each range in the block.  Once
    all of the ranges for a block have been collected, make_blockranges()
    is called to fill in BLOCK_RANGES for the block.
    
    The ranges are stored for the block in the order that they're read
    from the debug info.  For DWARF, the starting address of the first
    range of the block will be the entry pc in cases where DW_AT_entry_pc
    is not present.  (Well, that would ideally be the case.  At the moment
    DW_AT_entry_pc is not being handled.)
    
    gdb/ChangeLog:
    
    	* dwarf2read.c (dwarf2_record_block_ranges): Fill in BLOCK_RANGES
    	for block.

Diff:
---
 gdb/ChangeLog    | 2 ++
 gdb/dwarf2read.c | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 82eaa82..9dc0441 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -7,6 +7,8 @@
 	macros for accessing ranges in struct block.
 	(make_blockranges): New declaration.
 	block.c (make_blockranges): New function.
+	* dwarf2read.c (dwarf2_record_block_ranges): Fill in BLOCK_RANGES
+	for block.
 
 2018-08-23  Xavier Roirand  <roirand@adacore.com>
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 81a0087..8834d08 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -14846,6 +14846,7 @@ dwarf2_record_block_ranges (struct die_info *die, struct block *block,
       unsigned long offset = (DW_UNSND (attr)
 			      + (need_ranges_base ? cu->ranges_base : 0));
 
+      std::vector<blockrange> blockvec;
       dwarf2_ranges_process (offset, cu,
 	[&] (CORE_ADDR start, CORE_ADDR end)
 	{
@@ -14854,7 +14855,10 @@ dwarf2_record_block_ranges (struct die_info *die, struct block *block,
 	  start = gdbarch_adjust_dwarf2_addr (gdbarch, start);
 	  end = gdbarch_adjust_dwarf2_addr (gdbarch, end);
 	  cu->builder->record_block_range (block, start, end - 1);
+	  blockvec.emplace_back (start, end);
 	});
+
+      BLOCK_RANGES(block) = make_blockranges (objfile, blockvec);
     }
 }