From: Richard Guenther <rguenther@suse.de>
Date: Tue, 26 Jan 2010 15:09:43 +0000 (+0000)
Subject: re PR tree-optimization/42806 ("-fcompare-debug failure (length)" at -O1 in recent... 
X-Git-Tag: releases/gcc-4.5.0~1049
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3333cd50b87db95a83b3afebee66d2b8321f1fa1;p=thirdparty%2Fgcc.git

re PR tree-optimization/42806 ("-fcompare-debug failure (length)" at -O1 in recent builds)

2010-01-26  Richard Guenther  <rguenther@suse.de>

	PR middle-end/42806
	* tree-eh.c (unsplit_eh): Skip debug insns.

	* g++.dg/other/pr42806.C: New testcase.

From-SVN: r156249
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index da237e7e57d1..5d34ebb7ebf5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-26  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/42806
+	* tree-eh.c (unsplit_eh): Skip debug insns.
+
 2010-01-26  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/42250
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3cdaee3ea398..0238f4c71f79 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-26  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/42806
+	* g++.dg/other/pr42806.C: New testcase.
+
 2010-01-26  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/42250
diff --git a/gcc/testsuite/g++.dg/other/pr42806.C b/gcc/testsuite/g++.dg/other/pr42806.C
new file mode 100644
index 000000000000..9823238d5d4b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/pr42806.C
@@ -0,0 +1,22 @@
+// { dg-do compile }
+// { dg-options "-O -fcompare-debug" }
+
+struct S1 {
+    ~S1() { }
+};
+
+struct S2 {
+    S1 s1;
+    void m();
+    ~S2() { m(); }
+};
+
+struct S3 {
+    S3(int, S2);
+};
+
+void foo()
+{
+  S3(0, S2());
+}
+
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 1a9e7b50e6a5..2cb334ff0d49 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -3350,8 +3350,11 @@ unsplit_eh (eh_landing_pad lp)
   if ((e_in->flags & EDGE_EH) == 0 || (e_out->flags & EDGE_EH) != 0)
     return false;
 
-  /* The block must be empty except for the labels.  */
-  if (!gsi_end_p (gsi_after_labels (bb)))
+  /* The block must be empty except for the labels and debug insns.  */
+  gsi = gsi_after_labels (bb);
+  if (!gsi_end_p (gsi) && is_gimple_debug (gsi_stmt (gsi)))
+    gsi_next_nondebug (&gsi);
+  if (!gsi_end_p (gsi))
     return false;
 
   /* The destination block must not already have a landing pad