From 833ee764e77be266b6383feb9fd6cabf40a539b8 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 2 Sep 2008 21:13:47 +0200
Subject: [PATCH] re PR tree-optimization/36766 (natGC.cc:229: internal
 compiler error: Segmentation fault)

	PR tree-optimization/36766
	* tree-cfg.c (gimple_purge_all_dead_eh_edges): Do nothing
	for already removed basic blocks.

	* g++.dg/tree-ssa/pr36766.C: New test.

From-SVN: r139908
---
 gcc/ChangeLog                           |  4 ++++
 gcc/testsuite/ChangeLog                 |  3 +++
 gcc/testsuite/g++.dg/tree-ssa/pr36766.C | 31 +++++++++++++++++++++++++
 gcc/tree-cfg.c                          |  8 ++++++-
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr36766.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 670d5f3ba5b..4f5320958af 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-02  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/36766
+	* tree-cfg.c (gimple_purge_all_dead_eh_edges): Do nothing
+	for already removed basic blocks.
+
 	PR target/36332
 	* real.c (real_maxval): Clear a lower bit to make real_maxval
 	match get_max_float for IBM long double format.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f9fdc55a00a..d5c853f9a10 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2008-09-02  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/36766
+	* g++.dg/tree-ssa/pr36766.C: New test.
+
 	PR target/36332
 	* gcc.c-torture/execute/ieee/pr36332.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr36766.C b/gcc/testsuite/g++.dg/tree-ssa/pr36766.C
new file mode 100644
index 00000000000..37e0d517e9e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr36766.C
@@ -0,0 +1,31 @@
+// PR tree-optimization/36766
+// { dg-do compile }
+// { dg-options "-O -fnon-call-exceptions" }
+
+struct A
+{
+  ~A ()
+  {
+    int *a = this->b;
+  }
+  int *b;
+};
+
+struct B : A
+{
+  B ()
+  {
+    int *a = this->b;
+  }
+   ~B ()
+  {
+    int *a = this->b;
+  }
+};
+
+void
+foo ()
+{
+  B *c = new B;
+  delete c;
+}
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index f63e6762104..6bd8a06f8ad 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -6560,7 +6560,13 @@ gimple_purge_all_dead_eh_edges (const_bitmap blocks)
 
   EXECUTE_IF_SET_IN_BITMAP (blocks, 0, i, bi)
     {
-      changed |= gimple_purge_dead_eh_edges (BASIC_BLOCK (i));
+      basic_block bb = BASIC_BLOCK (i);
+
+      /* Earlier gimple_purge_dead_eh_edges could have removed
+	 this basic block already.  */
+      gcc_assert (bb || changed);
+      if (bb != NULL)
+	changed |= gimple_purge_dead_eh_edges (bb);
     }
 
   return changed;