Change breakpoint_re_set_default to a method

[binutils-gdb.git] / gdb / d-namespace.c

diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c
index 6e9ea776a54b996715b283afee11463d82db666a..5af042abb119e2373681fa083f6765887b30d35c 100644 (file)
--- a/gdb/d-namespace.c
+++ b/gdb/d-namespace.c
@@ -1,6 +1,6 @@
 /* Helper routines for D support in GDB.
 
-   Copyright (C) 2014-2018 Free Software Foundation, Inc.
+   Copyright (C) 2014-2022 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,7 +23,8 @@
 #include "language.h"
 #include "namespace.h"
 #include "d-lang.h"
-#include "gdb_obstack.h"
+#include "gdbsupport/gdb_obstack.h"
+#include "gdbarch.h"
 
 /* This returns the length of first component of NAME, which should be
    the demangled name of a D variable/function/method/etc.
@@ -127,10 +128,10 @@ d_lookup_symbol (const struct language_defn *langdef,
 
          lang_this = lookup_language_this (language_def (language_d), block);
          if (lang_this.symbol == NULL)
-           return null_block_symbol;
+           return {};
 
-         type = check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (lang_this.symbol)));
-         classname = TYPE_NAME (type);
+         type = check_typedef (TYPE_TARGET_TYPE (lang_this.symbol->type ()));
+         classname = type->name ();
          nested = name;
        }
       else
@@ -147,10 +148,10 @@ d_lookup_symbol (const struct language_defn *langdef,
         more that can be done.  */
       class_sym = lookup_global_symbol (classname.c_str (), block, domain);
       if (class_sym.symbol == NULL)
-       return null_block_symbol;
+       return {};
 
       /* Look for a symbol named NESTED in this class.  */
-      sym = d_lookup_nested_symbol (SYMBOL_TYPE (class_sym.symbol),
+      sym = d_lookup_nested_symbol (class_sym.symbol->type (),
                                    nested.c_str (), block);
     }
 
@@ -246,12 +247,9 @@ static struct block_symbol
 find_symbol_in_baseclass (struct type *parent_type, const char *name,
                          const struct block *block)
 {
-  struct block_symbol sym;
+  struct block_symbol sym = {};
   int i;
 
-  sym.symbol = NULL;
-  sym.block = NULL;
-
   for (i = 0; i < TYPE_N_BASECLASSES (parent_type); ++i)
     {
       struct type *base_type = TYPE_BASECLASS (parent_type, i);
@@ -310,7 +308,7 @@ d_lookup_nested_symbol (struct type *parent_type,
 
   parent_type = check_typedef (parent_type);
 
-  switch (TYPE_CODE (parent_type))
+  switch (parent_type->code ())
     {
     case TYPE_CODE_STRUCT:
     case TYPE_CODE_UNION:
@@ -349,7 +347,7 @@ d_lookup_nested_symbol (struct type *parent_type,
 
     case TYPE_CODE_FUNC:
     case TYPE_CODE_METHOD:
-      return null_block_symbol;
+      return {};
 
     default:
       gdb_assert_not_reached ("called with non-aggregate type.");
@@ -464,7 +462,7 @@ d_lookup_symbol_imports (const char *scope, const char *name,
        }
     }
 
-  return null_block_symbol;
+  return {};
 }
 
 /* Searches for NAME in the current module, and by applying relevant
@@ -493,10 +491,10 @@ d_lookup_symbol_module (const char *scope, const char *name,
       if (sym.symbol != NULL)
        return sym;
 
-      block = BLOCK_SUPERBLOCK (block);
+      block = block->superblock ();
     }
 
-  return null_block_symbol;
+  return {};
 }
 
 /* The D-specific version of name lookup for static and global names