From: Bernd Edlinger <bernd.edlinger@hotmail.de>
To: "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
Subject: [PATCH v3 3/3] Fix handling of DW_AT_entry_pc of inlined subroutines
Date: Sun, 5 Sep 2021 21:16:07 +0200 [thread overview]
Message-ID: <AM8PR10MB47085EB2398D87DA39B5B6ADE4D19@AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM> (raw)
[-- Attachment #1: Type: text/plain, Size: 814 bytes --]
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(+)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-Fix-handling-of-DW_AT_entry_pc-of-inlined-subroutine.patch --]
[-- Type: text/x-patch; name="0003-Fix-handling-of-DW_AT_entry_pc-of-inlined-subroutine.patch", Size: 2194 bytes --]
From 4953f0891b62444cc6e59d37709051925aa27b78 Mon Sep 17 00:00:00 2001
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Tue, 3 Nov 2020 18:41:43 +0100
Subject: [PATCH v3 3/3] Fix handling of DW_AT_entry_pc of inlined subroutines
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 358266a..4a9f47e 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -14265,6 +14265,18 @@ class process_die_scope
if (die->tag != DW_TAG_compile_unit)
ranges_offset += cu->gnu_ranges_base;
+ 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 (ranges_offset, cu, die->tag,
[&] (CORE_ADDR start, CORE_ADDR end)
@@ -14275,6 +14287,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
reply other threads:[~2021-09-05 19:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AM8PR10MB47085EB2398D87DA39B5B6ADE4D19@AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM \
--to=bernd.edlinger@hotmail.de \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).