diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-10-08 10:49:29 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-10-08 10:49:29 +0000 |
| commit | 3e1fdf07d9662b6a79e0d45115d25b54ca9e1e6f (patch) | |
| tree | 4774abf3c134e84d2f188993cd1e358c137e0ca0 /gcc | |
| parent | 6cf0f255bcdfdbc4ec2649ed886a961020388cfe (diff) | |
svn merge -r140612:140613 svn+ssh://gcc.gnu.org/svn/gcc/trunk/
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_3-branch@140973 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gomp/pr37533.C | 50 |
4 files changed, 67 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b9b6ebdbc8c..063ec32d688 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-09-23 Jakub Jelinek <jakub@redhat.com> + + PR c++/37533 + * semantics.c (finish_omp_for): If processing_template_decl, just build + MODIFY_EXPR for init instead of calling cp_build_modify_expr. + 2008-09-30 Simon Martin <simartin@users.sourceforge.net> PR c++/37555 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index dd18523745e..92e056cd9f8 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -4234,8 +4234,12 @@ finish_omp_for (location_t locus, tree declv, tree initv, tree condv, } if (!processing_template_decl) - init = fold_build_cleanup_point_expr (TREE_TYPE (init), init); - init = build_modify_expr (decl, NOP_EXPR, init); + { + init = fold_build_cleanup_point_expr (TREE_TYPE (init), init); + init = build_modify_expr (decl, NOP_EXPR, init); + } + else + init = build2 (MODIFY_EXPR, void_type_node, decl, init); if (cond && TREE_SIDE_EFFECTS (cond) && COMPARISON_CLASS_P (cond)) { int n = TREE_SIDE_EFFECTS (TREE_OPERAND (cond, 1)) != 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cc33efb1f5a..09b644e95de 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-23 Jakub Jelinek <jakub@redhat.com> + + PR c++/37533 + * g++.dg/gomp/pr37533.C: New test. + 2008-10-07 H.J. Lu <hongjiu.lu@intel.com> Backport from mainline: diff --git a/gcc/testsuite/g++.dg/gomp/pr37533.C b/gcc/testsuite/g++.dg/gomp/pr37533.C new file mode 100644 index 00000000000..7bf61945b2e --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr37533.C @@ -0,0 +1,50 @@ +// PR c++/37533 +// { dg-do compile } +// { dg-options "-fopenmp" } + +template<int> +void +f1 () +{ +#pragma omp parallel for + for (int i = ""; i < 4; ++i) // { dg-error "invalid conversion from" } + ; +} + +template<int> +void +f2 () +{ + int i; +#pragma omp parallel for + for (i = ""; i < 4; ++i) // { dg-error "invalid conversion from" } + ; +} + +template<typename T> +void +f3 () +{ +#pragma omp parallel for + for (T i = ""; i < 4; ++i) // { dg-error "invalid conversion from" } + ; +} + +template<typename T> +void +f4 () +{ + T i; +#pragma omp parallel for + for (i = ""; i < 4; ++i) // { dg-error "invalid conversion from" } + ; +} + +void +bar () +{ + f1<0> (); // { dg-message "instantiated from here" } + f2<1> (); // { dg-message "instantiated from here" } + f3<int> (); // { dg-message "instantiated from here" } + f4<int> (); // { dg-message "instantiated from here" } +} |