Don't allow NULL as an argument to block_global_block

block_global_block has special behavior when the block is NULL.
Remove this and patch up the callers instead.

diff --git a/gdb/block.c b/gdb/block.c
index d21729f069d3eb9e6d8c807dea53fa4ff785c421..5751a6b6f841824d7fb0f88d8308ad5295e010d1 100644 (file)
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -378,15 +378,11 @@ block_static_block (const struct block *block)
   return block;
 }
 
-/* Return the static block associated to BLOCK.  Return NULL if block
-   is NULL.  */
+/* Return the static block associated to BLOCK.  */
 
 const struct block *
 block_global_block (const struct block *block)
 {
-  if (block == NULL)
-    return NULL;
-
   while (block->superblock () != NULL)
     block = block->superblock ();
 

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index f7767c980c51b9ec331177e6842be2dfd0d5b194..fe56e610a5cb6ff8e9d9992c48570ca51b4b5201 100644 (file)
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1309,14 +1309,15 @@ add_symbol_overload_list_namespace (const char *func_name,
   /* Look in the static block.  */
   block = get_selected_block (0);
   block = block == nullptr ? nullptr : block_static_block (block);
-  if (block)
-    add_symbol_overload_list_block (name, block, overload_list);
-
-  /* Look in the global block.  */
-  block = block_global_block (block);
-  if (block)
-    add_symbol_overload_list_block (name, block, overload_list);
+  if (block != nullptr)
+    {
+      add_symbol_overload_list_block (name, block, overload_list);
 
+      /* Look in the global block.  */
+      block = block_global_block (block);
+      if (block)
+       add_symbol_overload_list_block (name, block, overload_list);
+    }
 }
 
 /* Search the namespace of the given type and namespace of and public

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 598e243b24cd50b99db61809b4c611914330a69d..3a380f131cd27768d1b3953872c9d9c6eb23754e 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2597,7 +2597,8 @@ lookup_global_symbol (const char *name,
   /* If a block was passed in, we want to search the corresponding
      global block first.  This yields "more expected" behavior, and is
      needed to support 'FILENAME'::VARIABLE lookups.  */
-  const struct block *global_block = block_global_block (block);
+  const struct block *global_block
+    = block == nullptr ? nullptr : block_global_block (block);
   symbol *sym = NULL;
   if (global_block != nullptr)
     {
@@ -5831,7 +5832,7 @@ default_collect_symbol_completion_matches_break_on
 
   b = get_selected_block (0);
   surrounding_static_block = b == nullptr ? nullptr : block_static_block (b);
-  surrounding_global_block = block_global_block (b);
+  surrounding_global_block = b == nullptr : nullptr : block_global_block (b);
   if (surrounding_static_block != NULL)
     while (b != surrounding_static_block)
       {