From 285e4952c1e61a57b537f29479860d81bf50ce3a Mon Sep 17 00:00:00 2001
From: Richard Guenther <rguenther@suse.de>
Date: Tue, 7 Nov 2006 17:29:34 +0000
Subject: [PATCH] re PR middle-end/29610 (ICE when compiling c++ code with -O2
 -funswitch-loops)

2006-11-07  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/29610
	* tree-cfgcleanup.c (cleanup_control_flow): Honor return value
	of tree_purge_dead_eh_edges as it may free dominators.

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

From-SVN: r118555
---
 gcc/ChangeLog                        |  8 ++++++++
 gcc/testsuite/g++.dg/other/pr29610.C | 38 ++++++++++++++++++++++++++++++++++++
 gcc/tree-cfgcleanup.c                |  2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/other/pr29610.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae1706c..a35e5d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-07  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/29610
+	* tree-cfgcleanup.c (cleanup_control_flow): Honor return value
+	of tree_purge_dead_eh_edges as it may free dominators.
+
+	* g++.dg/other/pr29610.C: New testcase.
+
 2006-11-07  David Ung  <davidu@mips.com>
 
 	* config/mips/mips.c (mips_rtx_cost_optimize_size): New table of
diff --git a/gcc/testsuite/g++.dg/other/pr29610.C b/gcc/testsuite/g++.dg/other/pr29610.C
new file mode 100644
index 0000000..6566fb9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/pr29610.C
@@ -0,0 +1,38 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -funswitch-loops" } */
+
+struct __normal_iterator 
+{
+  typedef int*const *_Iterator;
+  int*const * _M_current;
+  __normal_iterator(const _Iterator& __i) : _M_current(__i){}
+  const _Iterator& base() const {}
+};
+struct string { ~string(){} };
+struct vector 
+{
+  int** _M_finish;
+  __normal_iterator end() const   { return __normal_iterator (_M_finish); }
+  int size() const   { return end().base() - end().base(); }
+};
+class Painter
+{
+  int redraw_window(void);
+  typedef int (Painter::* SliceWindowFunc)(void);
+  int for_each(vector&, SliceWindowFunc);
+  void tcl_command(void);
+};
+inline int Painter::for_each(vector &layout, SliceWindowFunc func)
+{
+    for (unsigned int window = 0; window < layout.size();++window)
+        (this->*func)();
+}
+int t;
+int Painter::redraw_window(void) {t = 1;}
+string t2(int);
+vector *g(const string&);
+void Painter::tcl_command(void)
+{
+     for_each(*g(t2(2)), &Painter::redraw_window);
+}
+
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index be90209..dbcfd4d 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -160,7 +160,7 @@ cleanup_control_flow (void)
 
       /* If the last statement of the block could throw and now cannot,
 	 we need to prune cfg.  */
-      tree_purge_dead_eh_edges (bb);
+      retval |= tree_purge_dead_eh_edges (bb);
 
       if (bsi_end_p (bsi))
 	continue;
-- 
2.7.4