Fix latent bug with custom word point completers

[deliverable/binutils-gdb.git] / gdb / dwarf-index-write.c

diff --git a/gdb/dwarf-index-write.c b/gdb/dwarf-index-write.c
index 531256f2d58d05989271fc5edf505b34faf64329..8734f99212dac7120fce2b0c1fc4bb1a2a5caef8 100644 (file)
--- a/gdb/dwarf-index-write.c
+++ b/gdb/dwarf-index-write.c
@@ -540,7 +540,7 @@ write_psymbols (struct mapped_symtab *symtab,
     {
       struct partial_symbol *psym = *psymp;
 
-      if (psym->language == language_ada)
+      if (psym->ginfo.language == language_ada)
        error (_("Ada is not currently supported by the index"));
 
       /* Only add a given psymbol once.  */
@@ -548,7 +548,7 @@ write_psymbols (struct mapped_symtab *symtab,
        {
          gdb_index_symbol_kind kind = symbol_kind (psym);
 
-         add_index_entry (symtab, symbol_search_name (psym),
+         add_index_entry (symtab, symbol_search_name (&psym->ginfo),
                           is_static, kind, cu_index);
        }
     }
@@ -684,7 +684,7 @@ public:
     const int dwarf_tag = psymbol_tag (psym);
     if (dwarf_tag == 0)
       return;
-    const char *const name = symbol_search_name (psym);
+    const char *const name = symbol_search_name (&psym->ginfo);
     const auto insertpair
       = m_name_to_value_set.emplace (c_str_view (name),
                                     std::set<symbol_value> ());
@@ -1181,7 +1181,7 @@ private:
       {
        struct partial_symbol *psym = *psymp;
 
-       if (psym->language == language_ada)
+       if (psym->ginfo.language == language_ada)
          error (_("Ada is not currently supported by the index"));
 
        /* Only add a given psymbol once.  */
@@ -1681,7 +1681,7 @@ save_gdb_index_command (const char *arg, int from_tty)
              write_psymtabs_to_index (dwarf2_per_objfile, arg, basename,
                                       index_kind);
            }
-         catch (const gdb_exception_RETURN_MASK_ERROR &except)
+         catch (const gdb_exception_error &except)
            {
              exception_fprintf (gdb_stderr, except,
                                 _("Error while writing index for `%s': "),