X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fdwarf-index-write.c;h=f2abe70e155414542599f835b0859a03461cbf8c;hb=06a6207a1ab458521656f293bb1ca8fd013d6f7c;hp=48f385efb00968af5b5ceefe1a8814b9c273d3f7;hpb=30baf67b6505d903bf678f9a0ba3645eb337ce49;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/dwarf-index-write.c b/gdb/dwarf-index-write.c
index 48f385efb0..f2abe70e15 100644
--- a/gdb/dwarf-index-write.c
+++ b/gdb/dwarf-index-write.c
@@ -1,6 +1,6 @@
 /* DWARF index writing support for GDB.
 
-   Copyright (C) 1994-2019 Free Software Foundation, Inc.
+   Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -19,6 +19,8 @@
 
 #include "defs.h"
 
+#include "dwarf-index-write.h"
+
 #include "addrmap.h"
 #include "cli/cli-decode.h"
 #include "gdbsupport/byte-vector.h"
@@ -541,7 +543,7 @@ write_psymbols (struct mapped_symtab *symtab,
     {
       struct partial_symbol *psym = *psymp;
 
-      if (psym->ginfo.language == language_ada)
+      if (psym->ginfo.language () == language_ada)
 	error (_("Ada is not currently supported by the index; "
 		 "use the DWARF 5 index instead"));
 
@@ -550,7 +552,7 @@ write_psymbols (struct mapped_symtab *symtab,
 	{
 	  gdb_index_symbol_kind kind = symbol_kind (psym);
 
-	  add_index_entry (symtab, symbol_search_name (&psym->ginfo),
+	  add_index_entry (symtab, psym->ginfo.search_name (),
 			   is_static, kind, cu_index);
 	}
     }
@@ -686,9 +688,9 @@ public:
     const int dwarf_tag = psymbol_tag (psym);
     if (dwarf_tag == 0)
       return;
-    const char *name = symbol_search_name (&psym->ginfo);
+    const char *name = psym->ginfo.search_name ();
 
-    if (psym->ginfo.language == language_ada)
+    if (psym->ginfo.language () == language_ada)
       {
 	/* We want to ensure that the Ada main function's name appears
 	   verbatim in the index.  However, this name will be of the