diff mbox series

[2/3] Refactor cooked_index::do_finalize

Message ID	20221107162356.3175221-3-tromey@adacore.com
State	Committed
Commit	bed34ce7058b56d3a1e171de31df2a0a30afb8fd
Headers	DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 368373858C33 To: gdb-patches@sourceware.org Cc: Tom Tromey <tromey@adacore.com> Subject: [PATCH 2/3] Refactor cooked_index::do_finalize Date: Mon, 7 Nov 2022 09:23:55 -0700 Message-Id: <20221107162356.3175221-3-tromey@adacore.com> In-Reply-To: <20221107162356.3175221-1-tromey@adacore.com> References: <20221107162356.3175221-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Tom Tromey via Gdb-patches <gdb-patches@sourceware.org> Reply-To: Tom Tromey <tromey@adacore.com> Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	Fix over-eager CU expansion with new DWARF reader \| [0/3] Fix over-eager CU expansion with new DWARF reader [1/3] Remove language check from dwarf2_compute_name [2/3] Refactor cooked_index::do_finalize [3/3] Add name canonicalization for C

Commit Message

Tom Tromey Nov. 7, 2022, 4:23 p.m. UTC

  This refactors cooked_index::do_finalize, reordering an 'if' to make
it a little less redundant.  This change makes a subsequent patch
easier to read.
---
 gdb/dwarf2/cooked-index.c | 49 ++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

Comments

Andrew Burgess Dec. 1, 2022, 3:34 p.m. UTC | #1

Tom Tromey via Gdb-patches <gdb-patches@sourceware.org> writes:

> This refactors cooked_index::do_finalize, reordering an 'if' to make
> it a little less redundant.  This change makes a subsequent patch
> easier to read.

LGTM.

Thanks,
Andrew

> ---
>  gdb/dwarf2/cooked-index.c | 49 ++++++++++++++++++---------------------
>  1 file changed, 23 insertions(+), 26 deletions(-)
>
> diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
> index adb0046609e..a580d549d0d 100644
> --- a/gdb/dwarf2/cooked-index.c
> +++ b/gdb/dwarf2/cooked-index.c
> @@ -196,16 +196,28 @@ cooked_index::do_finalize ()
>    for (cooked_index_entry *entry : m_entries)
>      {
>        gdb_assert (entry->canonical == nullptr);
> -      if ((entry->per_cu->lang () != language_cplus
> -	   && entry->per_cu->lang () != language_ada)
> -	  || (entry->flags & IS_LINKAGE) != 0)
> +      if ((entry->flags & IS_LINKAGE) != 0)
>  	entry->canonical = entry->name;
> -      else
> +      else if (entry->per_cu->lang () == language_ada)
>  	{
> -	  if (entry->per_cu->lang () == language_ada)
> +	  gdb::unique_xmalloc_ptr<char> canon_name
> +	    = handle_gnat_encoded_entry (entry, gnat_entries.get ());
> +	  if (canon_name == nullptr)
> +	    entry->canonical = entry->name;
> +	  else
> +	    {
> +	      entry->canonical = canon_name.get ();
> +	      m_names.push_back (std::move (canon_name));
> +	    }
> +	}
> +      else if (entry->per_cu->lang () == language_cplus)
> +	{
> +	  void **slot = htab_find_slot (seen_names.get (), entry,
> +					INSERT);
> +	  if (*slot == nullptr)
>  	    {
>  	      gdb::unique_xmalloc_ptr<char> canon_name
> -		= handle_gnat_encoded_entry (entry, gnat_entries.get ());
> +		= cp_canonicalize_string (entry->name);
>  	      if (canon_name == nullptr)
>  		entry->canonical = entry->name;
>  	      else
> @@ -216,28 +228,13 @@ cooked_index::do_finalize ()
>  	    }
>  	  else
>  	    {
> -	      void **slot = htab_find_slot (seen_names.get (), entry,
> -					    INSERT);
> -	      if (*slot == nullptr)
> -		{
> -		  gdb::unique_xmalloc_ptr<char> canon_name
> -		    = cp_canonicalize_string (entry->name);
> -		  if (canon_name == nullptr)
> -		    entry->canonical = entry->name;
> -		  else
> -		    {
> -		      entry->canonical = canon_name.get ();
> -		      m_names.push_back (std::move (canon_name));
> -		    }
> -		}
> -	      else
> -		{
> -		  const cooked_index_entry *other
> -		    = (const cooked_index_entry *) *slot;
> -		  entry->canonical = other->canonical;
> -		}
> +	      const cooked_index_entry *other
> +		= (const cooked_index_entry *) *slot;
> +	      entry->canonical = other->canonical;
>  	    }
>  	}
> +      else
> +	entry->canonical = entry->name;
>      }
>  
>    m_names.shrink_to_fit ();
> -- 
> 2.34.3

diff mbox series

Patch

diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index adb0046609e..a580d549d0d 100644
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -196,16 +196,28 @@  cooked_index::do_finalize ()
   for (cooked_index_entry *entry : m_entries)
     {
       gdb_assert (entry->canonical == nullptr);
-      if ((entry->per_cu->lang () != language_cplus
-	   && entry->per_cu->lang () != language_ada)
-	  || (entry->flags & IS_LINKAGE) != 0)
+      if ((entry->flags & IS_LINKAGE) != 0)
 	entry->canonical = entry->name;
-      else
+      else if (entry->per_cu->lang () == language_ada)
 	{
-	  if (entry->per_cu->lang () == language_ada)
+	  gdb::unique_xmalloc_ptr<char> canon_name
+	    = handle_gnat_encoded_entry (entry, gnat_entries.get ());
+	  if (canon_name == nullptr)
+	    entry->canonical = entry->name;
+	  else
+	    {
+	      entry->canonical = canon_name.get ();
+	      m_names.push_back (std::move (canon_name));
+	    }
+	}
+      else if (entry->per_cu->lang () == language_cplus)
+	{
+	  void **slot = htab_find_slot (seen_names.get (), entry,
+					INSERT);
+	  if (*slot == nullptr)
 	    {
 	      gdb::unique_xmalloc_ptr<char> canon_name
-		= handle_gnat_encoded_entry (entry, gnat_entries.get ());
+		= cp_canonicalize_string (entry->name);
 	      if (canon_name == nullptr)
 		entry->canonical = entry->name;
 	      else
@@ -216,28 +228,13 @@  cooked_index::do_finalize ()
 	    }
 	  else
 	    {
-	      void **slot = htab_find_slot (seen_names.get (), entry,
-					    INSERT);
-	      if (*slot == nullptr)
-		{
-		  gdb::unique_xmalloc_ptr<char> canon_name
-		    = cp_canonicalize_string (entry->name);
-		  if (canon_name == nullptr)
-		    entry->canonical = entry->name;
-		  else
-		    {
-		      entry->canonical = canon_name.get ();
-		      m_names.push_back (std::move (canon_name));
-		    }
-		}
-	      else
-		{
-		  const cooked_index_entry *other
-		    = (const cooked_index_entry *) *slot;
-		  entry->canonical = other->canonical;
-		}
+	      const cooked_index_entry *other
+		= (const cooked_index_entry *) *slot;
+	      entry->canonical = other->canonical;
 	    }
 	}
+      else
+	entry->canonical = entry->name;
     }
 
   m_names.shrink_to_fit ();