* [PATCH 3/4] Fix handling of DW_AT_entry_pc of inlined subroutines
@ 2021-01-31 9:13 Bernd Edlinger
0 siblings, 0 replies; only message in thread
From: Bernd Edlinger @ 2021-01-31 9:13 UTC (permalink / raw)
To: gdb-patches
It may happen that the inline entry point is not the
start address of the first sub-range of an inline
function.
But the PC for a breakpoint on an inlined subroutine
is always the start address of the first sub-range.
This patch moves the sub-range starting at the entry
point to the first position of the block list.
Therefore the breakpoint on an inlined function
changes in rare cases from the start address of
the first sub-range to the real entry point.
There should always be a subrange that starts at the
entry point, even if that is an empty sub-range.
2021-01-01 Bernd Edlinger <bernd.edlinger@hotmail.de>
* dwarf2/read.c (dwarf2_record_block_ranges): Move range beginning
at DW_AT_entry_pc to the first block range.
---
gdb/dwarf2/read.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 5ed8acf..cae4199 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -14849,6 +14849,18 @@ class process_die_scope
unsigned long offset = (attr->as_unsigned ()
+ (need_ranges_base ? cu->ranges_base : 0));
+ CORE_ADDR entry_pc = (CORE_ADDR) -1;
+ if (die->tag == DW_TAG_inlined_subroutine)
+ {
+ attr = dwarf2_attr (die, DW_AT_entry_pc, cu);
+ if (attr != nullptr)
+ {
+ entry_pc = attr->as_address ();
+ entry_pc += baseaddr;
+ entry_pc = gdbarch_adjust_dwarf2_addr (gdbarch, entry_pc);
+ }
+ }
+
std::vector<blockrange> blockvec;
dwarf2_ranges_process (offset, cu, die->tag,
[&] (CORE_ADDR start, CORE_ADDR end)
@@ -14859,6 +14871,8 @@ class process_die_scope
end = gdbarch_adjust_dwarf2_addr (gdbarch, end);
cu->get_builder ()->record_block_range (block, start, end - 1);
blockvec.emplace_back (start, end);
+ if (entry_pc == start && blockvec.size () > 1)
+ std::swap (blockvec[0], blockvec[blockvec.size () - 1]);
});
BLOCK_RANGES(block) = make_blockranges (objfile, blockvec);
--
1.9.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-31 9:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-31 9:13 [PATCH 3/4] Fix handling of DW_AT_entry_pc of inlined subroutines Bernd Edlinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).