symtab.h (general_symbol_info) <mangled_lang>: delete and move up only member.

gdb/ChangeLog:

	* symtab.h (general_symbol_info) <mangled_lang>: Delete struct,
	move only member demangled_name up.  All uses updated.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d0d35b0..027a10f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2015-09-18  Doug Evans  <xdje42@gmail.com>
 
+       * symtab.h (general_symbol_info) <mangled_lang>: Delete struct,
+       move only member demangled_name up.  All uses updated.
+
+2015-09-18  Doug Evans  <xdje42@gmail.com>
+
        * findvar.c (default_read_var_value) <LOC_UNRESOLVED>: Include the
        kind of minimal symbol in the error message.
        * objfiles.c (objfile_flavour_name): New function.

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 49f3d9a..6ec2e9d 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -1414,7 +1414,7 @@ ada_decode_symbol (const struct general_symbol_info *arg)
 {
   struct general_symbol_info *gsymbol = (struct general_symbol_info *) arg;
   const char **resultp =
-    &gsymbol->language_specific.mangled_lang.demangled_name;
+    &gsymbol->language_specific.demangled_name;
 
   if (!gsymbol->ada_mangled)
     {

diff --git a/gdb/symtab.c b/gdb/symtab.c
index f65e809..90204cd 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -596,11 +596,11 @@ symbol_set_demangled_name (struct general_symbol_info *gsymbol,
       else
        {
          gsymbol->ada_mangled = 1;
-         gsymbol->language_specific.mangled_lang.demangled_name = name;
+         gsymbol->language_specific.demangled_name = name;
        }
     }
   else
-    gsymbol->language_specific.mangled_lang.demangled_name = name;
+    gsymbol->language_specific.demangled_name = name;
 }
 
 /* Return the demangled name of GSYMBOL.  */
@@ -615,7 +615,7 @@ symbol_get_demangled_name (const struct general_symbol_info *gsymbol)
       /* Fall through.  */
     }
 
-  return gsymbol->language_specific.mangled_lang.demangled_name;
+  return gsymbol->language_specific.demangled_name;
 }
 
 \f

diff --git a/gdb/symtab.h b/gdb/symtab.h
index e6fc174..d3f6370 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -137,11 +137,7 @@ struct general_symbol_info
 
     /* This is used by languages which wish to store a demangled name.
        currently used by Ada, C++, Java, and Objective C.  */
-    struct mangled_lang
-    {
-      const char *demangled_name;
-    }
-    mangled_lang;
+    const char *demangled_name;
   }
   language_specific;