find_function_start_sal

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 0c10f0465940b8d1c3119781b5b63baa9ac12c6a..611017e2b983ddcf20fb7adbc48829483f59b042 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -4017,7 +4017,6 @@ symbol_to_sal (struct symtab_and_line *result,
   if (SYMBOL_CLASS (sym) == LOC_BLOCK)
     {
       *result = find_function_start_sal (sym, funfirstline);
-      result->symbol = sym;
       return 1;
     }
   else

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 9ad407dc9d90ee7e25cc227fcc1caae7e2cebe03..5dd97cfdf6f9d0b673fd2b0d57da971d945944e0 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -3603,6 +3603,7 @@ find_function_start_sal (struct symbol *sym, int funfirstline)
       sal.pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
       if (gdbarch_skip_entrypoint_p (gdbarch))
        sal.pc = gdbarch_skip_entrypoint (gdbarch, sal.pc);
+      sal.symbol = sym;
       return sal;
     }
 
@@ -3622,6 +3623,7 @@ find_function_start_sal (struct symbol *sym, int funfirstline)
   if (funfirstline)
     skip_prologue_sal (&sal);
 
+  sal.symbol = sym;
   return sal;
 }