From 2d0689cb9c2dafe5c31c8470a90e15f548f5d294 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Fri, 1 Apr 2016 16:20:06 +0100
Subject: [PATCH] find_function_start_sal

---
 gdb/linespec.c | 1 -
 gdb/symtab.c   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 0c10f046594..611017e2b98 100644
--- 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 9ad407dc9d9..5dd97cfdf6f 100644
--- 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;
 }
 
-- 
2.47.2