Don't allow NULL as an argument to block_scope

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

diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c
index b6184034d5d272766071183c6ead608b280e0827..2978e5fecafc46e00e6c7c3c902a6a3a9c86147f 100644 (file)
--- a/gdb/d-namespace.c
+++ b/gdb/d-namespace.c
@@ -511,7 +511,7 @@ d_lookup_symbol_nonlocal (const struct language_defn *langdef,
                          const domain_enum domain)
 {
   struct block_symbol sym;
-  const char *scope = block_scope (block);
+  const char *scope = block == nullptr ? "" : block_scope (block);
 
   sym = lookup_module_scope (langdef, name, block, domain, scope, 0);
   if (sym.symbol != NULL)

diff --git a/gdb/rust-lang.h b/gdb/rust-lang.h
index 89e03550fb71e001555877bb30d2f1820e5e0ea9..497342d4ef32539683a1278092e4d9b0492492ad 100644 (file)
--- a/gdb/rust-lang.h
+++ b/gdb/rust-lang.h
@@ -148,17 +148,16 @@ public:
   {
     struct block_symbol result = {};
 
+    const char *scope = block == nullptr ? "" : block_scope (block);
     symbol_lookup_debug_printf
       ("rust_lookup_symbol_non_local (%s, %s (scope %s), %s)",
-       name, host_address_to_string (block), block_scope (block),
+       name, host_address_to_string (block), scope,
        domain_name (domain));
 
     /* Look up bare names in the block's scope.  */
     std::string scopedname;
     if (name[cp_find_first_component (name)] == '\0')
       {
-       const char *scope = block_scope (block);
-
        if (scope[0] != '\0')
          {
            scopedname = std::string (scope) + "::" + name;

diff --git a/gdb/rust-parse.c b/gdb/rust-parse.c
index 489be4b87e3b52099010667e789ba912ac981d08..72b843ef40c5ba9b1761a2c9f23b054b0581ee98 100644 (file)
--- a/gdb/rust-parse.c
+++ b/gdb/rust-parse.c
@@ -373,7 +373,9 @@ rust_parser::crate_name (const std::string &name)
 std::string
 rust_parser::super_name (const std::string &ident, unsigned int n_supers)
 {
-  const char *scope = block_scope (pstate->expression_context_block);
+  const char *scope = "";
+  if (pstate->expression_context_block != nullptr)
+    scope = block_scope (pstate->expression_context_block);
   int offset;
 
   if (scope[0] == '\0')