crash printing non-local variable from nested subprogram

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

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 1ba691e2a35cc4e7b01572a43ea48b5597637046..90204cd195362697de4c020b037d857ecefd3fce 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
@@ -3629,7 +3629,11 @@ find_function_start_sal (struct symbol *sym, int funfirstline)
       && (COMPUNIT_LOCATIONS_VALID (SYMTAB_COMPUNIT (sal.symtab))
          || SYMTAB_LANGUAGE (sal.symtab) == language_asm))
     {
+      struct gdbarch *gdbarch = symbol_arch (sym);
+
       sal.pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
+      if (gdbarch_skip_entrypoint_p (gdbarch))
+       sal.pc = gdbarch_skip_entrypoint (gdbarch, sal.pc);
       return sal;
     }