gdb: fix vfork with multiple threads

[deliverable/binutils-gdb.git] / gdb / macroscope.c

diff --git a/gdb/macroscope.c b/gdb/macroscope.c
index 23d2e50fddfa6136242ef979cd4fe47b86d3f5bb..eb1eac20af7363d069a0fd59593c916a88beb455 100644 (file)
--- a/gdb/macroscope.c
+++ b/gdb/macroscope.c
@@ -1,5 +1,5 @@
 /* Functions for deciding which macros are currently in scope.
-   Copyright (C) 2002-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002-2021 Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
@@ -60,26 +60,25 @@ sal_macro_scope (struct symtab_and_line sal)
   else
     {
       /* There are, unfortunately, cases where a compilation unit can
-         have a symtab for a source file that doesn't appear in the
-         macro table.  For example, at the moment, Dwarf doesn't have
-         any way in the .debug_macinfo section to describe the effect
-         of #line directives, so if you debug a YACC parser you'll get
-         a macro table which only mentions the .c files generated by
-         YACC, but symtabs that mention the .y files consumed by YACC.
-
-         In the long run, we should extend the Dwarf macro info
-         representation to handle #line directives, and get GCC to
-         emit it.
-
-         For the time being, though, we'll just treat these as
-         occurring at the end of the main source file.  */
+        have a symtab for a source file that doesn't appear in the
+        macro table.  For example, at the moment, Dwarf doesn't have
+        any way in the .debug_macinfo section to describe the effect
+        of #line directives, so if you debug a YACC parser you'll get
+        a macro table which only mentions the .c files generated by
+        YACC, but symtabs that mention the .y files consumed by YACC.
+
+        In the long run, we should extend the Dwarf macro info
+        representation to handle #line directives, and get GCC to
+        emit it.
+
+        For the time being, though, we'll just treat these as
+        occurring at the end of the main source file.  */
       ms->file = main_file;
       ms->line = -1;
 
-      complaint (&symfile_complaints,
-                 _("symtab found for `%s', but that file\n"
-                 "is not covered in the compilation unit's macro information"),
-                 symtab_to_filename_for_display (sal.symtab));
+      complaint (_("symtab found for `%s', but that file\n"
+                "is not covered in the compilation unit's macro information"),
+                symtab_to_filename_for_display (sal.symtab));
     }
 
   return ms;
@@ -112,18 +111,18 @@ default_macro_scope (void)
   else
     {
       /* Don't call select_source_symtab here.  That can raise an
-         error if symbols aren't loaded, but GDB calls the expression
-         evaluator in all sorts of contexts.
-
-         For example, commands like `set width' call the expression
-         evaluator to evaluate their numeric arguments.  If the
-         current language is C, then that may call this function to
-         choose a scope for macro expansion.  If you don't have any
-         symbol files loaded, then get_current_or_default would raise an
-         error.  But `set width' shouldn't raise an error just because
-         it can't decide which scope to macro-expand its argument in.  */
-      struct symtab_and_line cursal = 
-                       get_current_source_symtab_and_line ();
+        error if symbols aren't loaded, but GDB calls the expression
+        evaluator in all sorts of contexts.
+
+        For example, commands like `set width' call the expression
+        evaluator to evaluate their numeric arguments.  If the
+        current language is C, then that may call this function to
+        choose a scope for macro expansion.  If you don't have any
+        symbol files loaded, then get_current_or_default would raise an
+        error.  But `set width' shouldn't raise an error just because
+        it can't decide which scope to macro-expand its argument in.  */
+      struct symtab_and_line cursal
+       = get_current_source_symtab_and_line ();
       
       sal.symtab = cursal.symtab;
       sal.line = cursal.line;
@@ -141,20 +140,21 @@ default_macro_scope (void)
    location given by BATON, which must be a pointer to a `struct
    macro_scope' structure.  */
 struct macro_definition *
-standard_macro_lookup (const char *name, void *baton)
+standard_macro_lookup (const char *name, const macro_scope &ms)
 {
-  struct macro_scope *ms = (struct macro_scope *) baton;
-  struct macro_definition *result;
-
   /* Give user-defined macros priority over all others.  */
-  result = macro_lookup_definition (macro_main (macro_user_macros), -1, name);
-  if (! result)
-    result = macro_lookup_definition (ms->file, ms->line, name);
+  macro_definition *result
+    = macro_lookup_definition (macro_main (macro_user_macros), -1, name);
+
+  if (result == nullptr)
+    result = macro_lookup_definition (ms.file, ms.line, name);
+
   return result;
 }
 
+void _initialize_macroscope ();
 void
-_initialize_macroscope (void)
+_initialize_macroscope ()
 {
   macro_user_macros = new_macro_table (NULL, NULL, NULL);
   macro_set_main (macro_user_macros, "<user-defined>");