Re: [PATCH] Fix handling of #include files during prologue skipping

["Tiago Stürmer Daitx" <tdaitx@linux.vnet.ibm.com>]

Just noticed that I forgot to hit sent earlier on.

I added the copyright header to prologue-include.h and updated the
testcase to reflect the line number change. I also took the time to get
the license date right on the 3 prologue-include.* files: it was
2012-2013 where is should read 2013 only.

Let me know if this is acceptable.

Without patch:
$ gdb prologue-include
(gdb) break main
Breakpoint 1 at 0x10000594: file prologue-include.h, line 19.

With patch applied:
$ gdb prologue-include
(gdb) break main
Breakpoint 1 at 0x1000058c: file prologue-include.h, line 18.

Thanks for all your help.

-tiago

---

gdb/ChangeLog

2013-01-24  Ulrich Weigand  <uweigand@de.ibm.com>

	* symtab.c (skip_prologue_using_sal): Consider a file
	change the same as an increased line number

gdb/testsuite/ChangeLog

2013-01-24  Tiago Stürmer Daitx  <tdaitx@linux.vnet.ibm.com>

	* gdb.base/prologue-include.c: New file.
	* gdb.base/prologue-include.exp: New file.
	* gdb.base/prologue-include.h: New file.


diff --git a/gdb/symtab.c b/gdb/symtab.c
index d40436a..b200b36 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -4905,6 +4905,10 @@ skip_prologue_using_sal (struct gdbarch *gdbarch,
CORE_ADDR func_addr)
 	     line mark the prologue -> body transition.  */
 	  if (sal.line >= prologue_sal.line)
 	    break;
+	  /* Likewise if we are in a different symtab altogether
+	     (e.g. within a file included via #include).  */
+	  if (sal.symtab != prologue_sal.symtab)
+	    break;
 
 	  /* The line number is smaller.  Check that it's from the
 	     same function, not something inlined.  If it's inlined,
diff --git a/gdb/testsuite/gdb.base/prologue-include.c
b/gdb/testsuite/gdb.base/prologue-include.c
new file mode 100644
index 0000000..c393e75
--- /dev/null
+++ b/gdb/testsuite/gdb.base/prologue-include.c
@@ -0,0 +1,25 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2013 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see
<http://www.gnu.org/licenses/>.  */
+
+int
+main (void)
+{
+  int i, j;
+#include "prologue-include.h"
+  return 0;
+}
+
diff --git a/gdb/testsuite/gdb.base/prologue-include.exp
b/gdb/testsuite/gdb.base/prologue-include.exp
new file mode 100644
index 0000000..f18d55a
--- /dev/null
+++ b/gdb/testsuite/gdb.base/prologue-include.exp
@@ -0,0 +1,24 @@
+# Copyright (C) 2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+standard_testfile
+
+if { [prepare_for_testing ${testfile}.exp ${testfile}] } {
+    return -1
+}
+
+gdb_test "break main" \
+    "Breakpoint.*at.* file .*$testfile.h, line 18\\." \
+    "breakpoint main"
diff --git a/gdb/testsuite/gdb.base/prologue-include.h
b/gdb/testsuite/gdb.base/prologue-include.h
new file mode 100644
index 0000000..7da7d4a
--- /dev/null
+++ b/gdb/testsuite/gdb.base/prologue-include.h
@@ -0,0 +1,19 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2013 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see
<http://www.gnu.org/licenses/>.  */
+
+  i = 2;
+  j = 2;


-- 
Tiago Stürmer Daitx
tdaitx@linux.vnet.ibm.com
IBM - Linux Technology Center


On Thu, 2013-01-24 at 11:11 -0200, Tiago Stürmer Daitx wrote:
> Yes, it still shows up. Sorry, should have added this information
> before.
> 
> Without patch:
> $ gdb prologue-include
> (gdb) break main
> Breakpoint 1 at 0x10000594: file prologue-include.h, line 19.
> 
> With patch applied:
> $ gdb prologue-include
> (gdb) break main
> Breakpoint 1 at 0x1000058c: file prologue-include.h, line 18.
> 
> 
>