From ba7226a7e1bf9f55ebf8016c57c4d8ab8b1333a8 Mon Sep 17 00:00:00 2001 From: jakub Date: Sat, 27 Dec 2008 15:38:22 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142934 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/gomp/pr38633.C | 14 ++++++++++++++ gcc/testsuite/gcc.dg/gomp/pr38633.c | 14 ++++++++++++++ gcc/tree-cfg.c | 2 ++ 5 files changed, 40 insertions(+) create mode 100644 gcc/testsuite/g++.dg/gomp/pr38633.C create mode 100644 gcc/testsuite/gcc.dg/gomp/pr38633.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c2fda35bdac..2c0872260a8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-12-27 Jakub Jelinek + + 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 * Makefile.in (GTFILES): Add $(srcdir)/expr.h. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fb334fb2559..7f5c20cda6f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2008-12-27 Jakub Jelinek + 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 index 00000000000..99b87957380 --- /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 index 00000000000..6c96bd1c18c --- /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 89621f0a80a..b300c53ad26 100644 --- 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) { -- 2.11.0