This fixes the -g variant of the original testcase.

Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed.

        PR tree-optimization/109410
        * tree-ssa-reassoc.cc (build_and_add_sum): Use
        gsi_start_nondebug_after_labels_bb to look for a possible
        returns-twice call.

        * gcc.dg/pr109410-2.c: New testcase.
---
 gcc/testsuite/gcc.dg/pr109410-2.c | 5 +++++
 gcc/tree-ssa-reassoc.cc           | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.dg/pr109410-2.c

diff --git a/gcc/testsuite/gcc.dg/pr109410-2.c 
b/gcc/testsuite/gcc.dg/pr109410-2.c
new file mode 100644
index 00000000000..9dd8d0943c5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr109410-2.c
@@ -0,0 +1,5 @@
+/* PR tree-optimization/109410 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -g" } */
+
+#include "pr109410.c"
diff --git a/gcc/tree-ssa-reassoc.cc b/gcc/tree-ssa-reassoc.cc
index d2d2e084aa6..7abbf195520 100644
--- a/gcc/tree-ssa-reassoc.cc
+++ b/gcc/tree-ssa-reassoc.cc
@@ -1568,7 +1568,8 @@ build_and_add_sum (tree type, tree op1, tree op2, enum 
tree_code opcode)
   if ((!op1def || gimple_nop_p (op1def))
       && (!op2def || gimple_nop_p (op2def)))
     {
-      gsi = gsi_after_labels (single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun)));
+      gsi = gsi_start_nondebug_after_labels_bb
+               (single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun)));
       if (!gsi_end_p (gsi)
          && is_gimple_call (gsi_stmt (gsi))
          && (gimple_call_flags (gsi_stmt (gsi)) & ECF_RETURNS_TWICE))
-- 
2.51.0

Reply via email to