Remove some unneeded checks in Guile code

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 --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c
index a29c2db58f10ab240fcfa57359e7ebec1e7fe78e..07c6a2bd5e523e908af3dd51724ca6679297c398 100644 (file)
--- a/gdb/guile/scm-block.c
+++ b/gdb/guile/scm-block.c
@@ -97,11 +97,9 @@ struct bkscm_deleter
 
   void operator() (htab_t htab)
   {
-    if (htab != NULL)
-      {
-       htab_traverse_noresize (htab, bkscm_mark_block_invalid, NULL);
-       htab_delete (htab);
-      }
+    gdb_assert (htab != nullptr);
+    htab_traverse_noresize (htab, bkscm_mark_block_invalid, NULL);
+    htab_delete (htab);
   }
 };
 

diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c
index 4132bb246d8f5897e5f8b2253b7786470ebbddfd..159603b80088236047d18a2476ee0c9dea8f5306 100644 (file)
--- a/gdb/guile/scm-frame.c
+++ b/gdb/guile/scm-frame.c
@@ -95,11 +95,9 @@ struct frscm_deleter
 
   void operator() (htab_t htab)
   {
-    if (htab != NULL)
-      {
-       htab_traverse_noresize (htab, frscm_mark_frame_invalid, NULL);
-       htab_delete (htab);
-      }
+    gdb_assert (htab != nullptr);
+    htab_traverse_noresize (htab, frscm_mark_frame_invalid, NULL);
+    htab_delete (htab);
   }
 };
 

diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index 0b96e5a02c15eb479cb19098fd1cfa8ce9bc52f4..78917bdbed084286c8b16c20d9c5887f0aef0493 100644 (file)
--- a/gdb/guile/scm-symbol.c
+++ b/gdb/guile/scm-symbol.c
@@ -70,11 +70,9 @@ struct syscm_deleter
 
   void operator() (htab_t htab)
   {
-    if (htab != NULL)
-      {
-       htab_traverse_noresize (htab, syscm_mark_symbol_invalid, NULL);
-       htab_delete (htab);
-      }
+    gdb_assert (htab != nullptr);
+    htab_traverse_noresize (htab, syscm_mark_symbol_invalid, NULL);
+    htab_delete (htab);
   }
 };
 

diff --git a/gdb/guile/scm-symtab.c b/gdb/guile/scm-symtab.c
index 940823147bf2e5f449994f65cd2dc3b98e4c9376..2ff66c49d513a76d6538864012289a3916479874 100644 (file)
--- a/gdb/guile/scm-symtab.c
+++ b/gdb/guile/scm-symtab.c
@@ -98,11 +98,9 @@ struct stscm_deleter
 
   void operator() (htab_t htab)
   {
-    if (htab != NULL)
-      {
-       htab_traverse_noresize (htab, stscm_mark_symtab_invalid, NULL);
-       htab_delete (htab);
-      }
+    gdb_assert (htab != nullptr);
+    htab_traverse_noresize (htab, stscm_mark_symtab_invalid, NULL);
+    htab_delete (htab);
   }
 };
 

diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index 2dadbefb3a4494fee348a3518757c7cd1e0198bf..5cb1cabe14d311b0b7078a76010dc94ee659eea0 100644 (file)
--- a/gdb/guile/scm-type.c
+++ b/gdb/guile/scm-type.c
@@ -93,13 +93,10 @@ struct tyscm_deleter
     if (!gdb_scheme_initialized)
       return;
 
+    gdb_assert (htab != nullptr);
     htab_up copied_types = create_copied_types_hash ();
-
-    if (htab != 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);
   }
 };