[Bug ada/28180] FAIL: gdb.ada/interface.exp: print s (timeout)

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=28180

--- Comment #4 from Tom de Vries <vries at gcc dot gnu.org> ---
This allows the test-case to pass:
...
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 6680a4fd657..e3bfcd8aa9f 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -3539,6 +3539,16 @@ ada_resolve_variable (struct symbol *sym, const struct
block *block,

         candidates.end ());
     }

+  candidates.erase
+    (std::remove_if
+     (candidates.begin (),
+      candidates.end (),
+      [] (block_symbol &bsym)
+      {
+       return bsym.symbol->artificial;
+      }),
+     candidates.end ());
+
   int i;
   if (candidates.empty ())
     error (_("No definition found for %s"), sym->print_name ());
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index acabee3315f..bff615d31ee 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -21592,6 +21592,10 @@ new_symbol (struct die_info *die, struct type *type,
struct dwarf2
_cu *cu,
        sym = new (&objfile->objfile_obstack) symbol;
       OBJSTAT (objfile, n_syms++);

+      attr = dwarf2_attr (die, DW_AT_artificial, cu);
+      if (attr != nullptr)
+       sym->artificial = 1;
+
       /* Cache this symbol's name and the name's demangled form (if any).  */
       sym->set_language (cu->per_cu->lang, &objfile->objfile_obstack);
       /* Fortran does not have mangling standard and the mangling does differ
diff --git a/gdb/symtab.h b/gdb/symtab.h
index fd8dd62a406..b028586e50f 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -536,6 +536,8 @@ struct general_symbol_info
      valid.  */
   unsigned int ada_mangled : 1;

+  unsigned int artificial : 1;
+
   /* Which section is this symbol in?  This is an index into
      section_offsets for this objfile.  Negative means that the symbol
      does not get relocated relative to a section.  */
@@ -1131,6 +1133,7 @@ struct symbol : public general_symbol_info, public
allocate_on_obstac
k
       language_specific.obstack = nullptr;
       m_language = language_unknown;
       ada_mangled = 0;
+      artificial = 0;
       m_section = -1;
       /* GCC 4.8.5 (on CentOS 7) does not correctly compile class-
         initialization of unions, so we initialize it manually here.  */
...
and passes gdb.ada/*.exp.

-- 
You are receiving this mail because:
You are on the CC list for the bug.