From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tromey@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2126)
 id F108D385AC08; Thu, 28 Jul 2022 20:44:26 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F108D385AC08
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Tom Tromey <tromey@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] Remove some unneeded checks in Guile code
X-Act-Checkin: binutils-gdb
X-Git-Author: Tom Tromey <tom@tromey.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 8126c055e453a494a72a44c9cce39fa8ddf14607
X-Git-Newrev: 43cffa64cf72f11a95203cd89844f82aa906c7e7
Message-Id: <20220728204426.F108D385AC08@sourceware.org>
Date: Thu, 28 Jul 2022 20:44:26 +0000 (GMT)
X-BeenThere: gdb-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gdb-cvs mailing list <gdb-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/gdb-cvs/>
List-Help: <mailto:gdb-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jul 2022 20:44:27 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D43cffa64cf72=
f11a95203cd89844f82aa906c7e7

commit 43cffa64cf72f11a95203cd89844f82aa906c7e7
Author: Tom Tromey <tom@tromey.com>
Date:   Sat May 28 21:06:19 2022 -0600

    Remove some unneeded checks in Guile code
   =20
    The Guile code generally checks to see if an htab is non-null before
    destroying it.  However, the registry code already ensures this, so we
    can change these checks to asserts and simplify the code a little.

Diff:
---
 gdb/guile/scm-block.c  | 8 +++-----
 gdb/guile/scm-frame.c  | 8 +++-----
 gdb/guile/scm-symbol.c | 8 +++-----
 gdb/guile/scm-symtab.c | 8 +++-----
 gdb/guile/scm-type.c   | 9 +++------
 5 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c
index a29c2db58f1..07c6a2bd5e5 100644
--- a/gdb/guile/scm-block.c
+++ b/gdb/guile/scm-block.c
@@ -97,11 +97,9 @@ struct bkscm_deleter
=20
   void operator() (htab_t htab)
   {
-    if (htab !=3D NULL)
-      {
-	htab_traverse_noresize (htab, bkscm_mark_block_invalid, NULL);
-	htab_delete (htab);
-      }
+    gdb_assert (htab !=3D nullptr);
+    htab_traverse_noresize (htab, bkscm_mark_block_invalid, NULL);
+    htab_delete (htab);
   }
 };
=20
diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c
index 4132bb246d8..159603b8008 100644
--- a/gdb/guile/scm-frame.c
+++ b/gdb/guile/scm-frame.c
@@ -95,11 +95,9 @@ struct frscm_deleter
=20
   void operator() (htab_t htab)
   {
-    if (htab !=3D NULL)
-      {
-	htab_traverse_noresize (htab, frscm_mark_frame_invalid, NULL);
-	htab_delete (htab);
-      }
+    gdb_assert (htab !=3D nullptr);
+    htab_traverse_noresize (htab, frscm_mark_frame_invalid, NULL);
+    htab_delete (htab);
   }
 };
=20
diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index 0b96e5a02c1..78917bdbed0 100644
--- a/gdb/guile/scm-symbol.c
+++ b/gdb/guile/scm-symbol.c
@@ -70,11 +70,9 @@ struct syscm_deleter
=20
   void operator() (htab_t htab)
   {
-    if (htab !=3D NULL)
-      {
-	htab_traverse_noresize (htab, syscm_mark_symbol_invalid, NULL);
-	htab_delete (htab);
-      }
+    gdb_assert (htab !=3D nullptr);
+    htab_traverse_noresize (htab, syscm_mark_symbol_invalid, NULL);
+    htab_delete (htab);
   }
 };
=20
diff --git a/gdb/guile/scm-symtab.c b/gdb/guile/scm-symtab.c
index 940823147bf..2ff66c49d51 100644
--- a/gdb/guile/scm-symtab.c
+++ b/gdb/guile/scm-symtab.c
@@ -98,11 +98,9 @@ struct stscm_deleter
=20
   void operator() (htab_t htab)
   {
-    if (htab !=3D NULL)
-      {
-	htab_traverse_noresize (htab, stscm_mark_symtab_invalid, NULL);
-	htab_delete (htab);
-      }
+    gdb_assert (htab !=3D nullptr);
+    htab_traverse_noresize (htab, stscm_mark_symtab_invalid, NULL);
+    htab_delete (htab);
   }
 };
=20
diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index 2dadbefb3a4..5cb1cabe14d 100644
--- a/gdb/guile/scm-type.c
+++ b/gdb/guile/scm-type.c
@@ -93,13 +93,10 @@ struct tyscm_deleter
     if (!gdb_scheme_initialized)
       return;
=20
+    gdb_assert (htab !=3D nullptr);
     htab_up copied_types =3D create_copied_types_hash ();
-
-    if (htab !=3D NULL)
-      {
-	htab_traverse_noresize (htab, tyscm_copy_type_recursive, copied_types.get=
 ());
-	htab_delete (htab);
-      }
+    htab_traverse_noresize (htab, tyscm_copy_type_recursive, copied_types.=
get ());
+    htab_delete (htab);
   }
 };