From d5d86fde90742a0fcd0a75693ec977b5d8bf5645 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 2 May 2006 12:38:12 +0200
Subject: [PATCH] re PR middle-end/27310 (ICE in duplicate_eh_regions)

	PR middle-end/27310
	* except.c (duplicate_eh_regions): Fix clearing of
	cfun->eh->region_array entries.

	* g++.dg/gomp/pr27310.C: New test.

From-SVN: r113453
---
 gcc/ChangeLog                       |  6 ++++++
 gcc/except.c                        |  2 +-
 gcc/testsuite/ChangeLog             |  5 +++++
 gcc/testsuite/g++.dg/gomp/pr27310.C | 22 ++++++++++++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/gomp/pr27310.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 14514290b51..e4fa4b6edf5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/27310
+	* except.c (duplicate_eh_regions): Fix clearing of
+	cfun->eh->region_array entries.
+
 2006-05-01  DJ Delorie  <dj@redhat.com>
 
 	* configure.ac (gcc_cv_nm): Don't use an in-tree nm if
diff --git a/gcc/except.c b/gcc/except.c
index 57e71bdfb44..ba6b505008d 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -956,7 +956,7 @@ duplicate_eh_regions (struct function *ifun, duplicate_eh_regions_map map,
 
   /* Zero all entries in the range allocated.  */
   memset (VEC_address (eh_region, cfun->eh->region_array)
-	  + cfun_last_region_number + 1, 0, num_regions);
+	  + cfun_last_region_number + 1, 0, num_regions * sizeof (eh_region));
 
   /* Locate the spot at which to insert the new tree.  */
   if (outer_region > 0)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ad32581b512..f9cbeb3a76e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/27310
+	* g++.dg/gomp/pr27310.C: New test.
+
 2006-05-01  Zdenek Dvorak <dvorakz@suse.cz>
 
 	PR tree-optimization/27291
diff --git a/gcc/testsuite/g++.dg/gomp/pr27310.C b/gcc/testsuite/g++.dg/gomp/pr27310.C
new file mode 100644
index 00000000000..d921e6af2bc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr27310.C
@@ -0,0 +1,22 @@
+// PR middle-end/27310
+// { dg-do compile }
+// { dg-options "-O2 -fopenmp" }
+
+struct A
+{
+  ~A ();
+};
+
+struct B
+{
+  A a, b;
+};
+
+void
+foo ()
+{
+  A c, d;
+
+#pragma omp parallel
+  B e;
+}