re PR middle-end/38633 (ICE with #pragma omp parallel and struct declaration)

	PR middle-end/38633
	* tree-cfg.c (replace_block_vars_by_duplicates): Only call
	replace_by_duplicate_decl for VAR_DECLs or CONST_DECLs.

	* gcc.dg/gomp/pr38633.c: New test.
	* g++.dg/gomp/pr38633.C: New test.

From-SVN: r142934

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2fda35bdacd864383cf87f41ec24df3c01c5768..2c0872260a80668de13bcaa3ab644f941a3b0d11 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-27  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/38633
+       * tree-cfg.c (replace_block_vars_by_duplicates): Only call
+       replace_by_duplicate_decl for VAR_DECLs or CONST_DECLs.
+
 2008-12-24  Kazu Hirata  <kazu@codesourcery.com>
 
        * Makefile.in (GTFILES): Add $(srcdir)/expr.h.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fb334fb25595cbd0b620d30fb6878eb1952f4cd3..7f5c20cda6f161900fedaf20989284598abd48cc 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2008-12-27  Jakub Jelinek  <jakub@redhat.com>
 
+       PR middle-end/38633
+       * gcc.dg/gomp/pr38633.c: New test.
+       * g++.dg/gomp/pr38633.C: New test.
+
        PR c++/38639
        * g++.dg/gomp/pr38639.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/gomp/pr38633.C b/gcc/testsuite/g++.dg/gomp/pr38633.C
new file mode 100644 (file)
index 0000000..99b8795
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr38633.C
@@ -0,0 +1,14 @@
+// PR middle-end/38633
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+void
+foo ()
+{
+#pragma omp parallel
+  {
+    struct A { int i; } j;
+    j.i = 6;
+    j.i++;
+  }
+}

diff --git a/gcc/testsuite/gcc.dg/gomp/pr38633.c b/gcc/testsuite/gcc.dg/gomp/pr38633.c
new file mode 100644 (file)
index 0000000..6c96bd1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/gomp/pr38633.c
@@ -0,0 +1,14 @@
+/* PR middle-end/38633 */
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+void
+foo ()
+{
+#pragma omp parallel
+  {
+    struct A { int i; } j;
+    j.i = 6;
+    j.i++;
+  }
+}

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 89621f0a80ac849d2839077cca62860dd6c5be1e..b300c53ad266f5d83daf7fbb6779dc1a5dff1bda 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -5835,6 +5835,8 @@ replace_block_vars_by_duplicates (tree block, struct pointer_map_t *vars_map,
   for (tp = &BLOCK_VARS (block); *tp; tp = &TREE_CHAIN (*tp))
     {
       t = *tp;
+      if (TREE_CODE (t) != VAR_DECL && TREE_CODE (t) != CONST_DECL)
+       continue;
       replace_by_duplicate_decl (&t, vars_map, to_context);
       if (t != *tp)
        {