From b29ee46cf2f0010084b621c1d2ec50bb5b6a8964 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Wed, 14 Oct 2009 11:53:55 +0200
Subject: [PATCH] re PR debug/41695 (Invalid .debug_loc created)
PR debug/41695
* dwarf2out.c (dwarf2out_var_location): Always clear
last_postcall_label when changing last_label.
* gcc.dg/debug/dwarf2/pr41695.c: New test.
From-SVN: r152760
---
gcc/ChangeLog | 6 ++++++
gcc/dwarf2out.c | 3 +--
gcc/testsuite/ChangeLog | 7 ++++++-
gcc/testsuite/gcc.dg/debug/dwarf2/pr41695.c | 18 ++++++++++++++++++
4 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/debug/dwarf2/pr41695.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bbb97ec6c9c7..992f9b647c06 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-14 Jakub Jelinek <jakub@redhat.com>
+
+ PR debug/41695
+ * dwarf2out.c (dwarf2out_var_location): Always clear
+ last_postcall_label when changing last_label.
+
2009-10-14 Pascal Obry <obry@adacore.com>
* gcc.c (DEFAULT_SWITCH_CURTAILS_COMPILATION): Add -E.
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 1e47e7a17042..2f9d2b8337b8 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -20013,8 +20013,7 @@ dwarf2out_var_location (rtx loc_note)
ASM_OUTPUT_DEBUG_LABEL (asm_out_file, "LVL", loclabel_num);
loclabel_num++;
last_label = ggc_strdup (loclabel);
- if (!NOTE_DURING_CALL_P (loc_note))
- last_postcall_label = NULL;
+ last_postcall_label = NULL;
}
newloc->var_loc_note = loc_note;
newloc->next = NULL;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3faf8f2544eb..c93c579c5c8a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,8 +1,13 @@
+2009-10-14 Jakub Jelinek <jakub@redhat.com>
+
+ PR debug/41695
+ * gcc.dg/debug/dwarf2/pr41695.c: New test.
+
2009-10-14 Uros Bizjak <ubizjak@gmail.com>
* gcc.target/i386/i386.exp (check_effective_target_ms_hook_prologue):
New procedure.
- * gcc.target/i386/ms_hook_prologue.c: Check for ms_hook_prologue
+ * gcc.target/i386/ms_hook_prologue.c: Check for ms_hook_prologue
effective target.
2009-10-14 Jason Merrill <jason@redhat.com>
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41695.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41695.c
new file mode 100644
index 000000000000..d61b5a293f56
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41695.c
@@ -0,0 +1,18 @@
+/* PR debug/41695 */
+/* { dg-do compile } */
+/* { dg-options "-g -O2 -dA -fno-merge-debug-strings" } */
+
+int bar (int);
+
+void
+foo (void)
+{
+ int b = 0;
+ b = bar (b);
+ b = bar (b);
+ b = bar (b);
+ b = bar (b);
+ bar (b);
+}
+
+/* { dg-final { scan-assembler-not "LVL(\[0-9\]+)-\[^1\]\[^\\r\\n\]*Location list begin address\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*LVL\\1-1-" } } */
--
GitLab