public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [RFC 3/7] [gdb/symtab] Handle nullptr parent in parent_map::set_parent
Date: Fri, 25 Aug 2023 17:55:42 +0200	[thread overview]
Message-ID: <20230825155546.19617-4-tdevries@suse.de> (raw)
In-Reply-To: <20230825155546.19617-1-tdevries@suse.de>

Set_parent uses m_die_range_map.set_empty, which doesn't allow
parent_entry == nullptr.

So it may be necessary to guard calls to set_parent with
"if (parent_entry != nullptr)".

Fix this by handling the parent_entry == nullptr case.

Tested on x86_64-linux.
---
 gdb/dwarf2/cooked-index.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h
index a921f25ecf2..23db5918878 100644
--- a/gdb/dwarf2/cooked-index.h
+++ b/gdb/dwarf2/cooked-index.h
@@ -253,7 +253,10 @@ class parent_map
   void set_parent (CORE_ADDR start, CORE_ADDR end,
 		   const cooked_index_entry *parent_entry)
   {
-    m_parent_map.set_empty (start, end, (void *)parent_entry);
+    /* Calling set_empty with nullptr is currently not allowed.  Note that we
+       still check the desired effect.  */
+    if (parent_entry != nullptr)
+      m_parent_map.set_empty (start, end, (void *)parent_entry);
 
     /* Assert that set_parent has the desired effect.  This is not trivial due
        to how set_empty works.  If the range already has been set before, it
-- 
2.35.3


  parent reply	other threads:[~2023-08-25 15:55 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-25 15:55 [RFC 0/7] [gdb/symtab, cc-with-dwz] Fix gdb.cp/breakpoint-locs.exp Tom de Vries
2023-08-25 15:55 ` [RFC 1/7] [gdb/symtab] Factor out m_die_range_map and m_deferred_entries usage Tom de Vries
2023-08-25 15:55 ` [RFC 2/7] [gdb/symtab] Check effect in parent_map::set_parent Tom de Vries
2023-08-25 15:55 ` Tom de Vries [this message]
2023-08-25 15:55 ` [RFC 4/7] [gdb/symtab] Add parent_map::dump Tom de Vries
2023-08-25 15:55 ` [RFC 5/7] [gdb/symtab] Add debug_handle_deferred_entries Tom de Vries
2023-08-25 15:55 ` [RFC 6/7] [gdb/symtab] Add DW_TAG_inlined_subroutine entries in the cooked index for c++ Tom de Vries
2023-08-25 15:55 ` [RFC 7/7] [gdb/symtab] Resolve deferred entries, inter-shard case Tom de Vries
2023-09-08 18:56 ` [RFC 0/7] [gdb/symtab, cc-with-dwz] Fix gdb.cp/breakpoint-locs.exp Tom Tromey
2023-09-12 15:23   ` Tom de Vries
2023-09-13 14:37   ` Tom de Vries
2023-10-02 12:52     ` Tom de Vries

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=20230825155546.19617-4-tdevries@suse.de \
    --to=tdevries@suse.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).