diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-02-19 11:14:57 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-02-19 11:14:57 +0100 |
| commit | dadb19e068ada9ee77d36be1c1bd14730d0493cd (patch) | |
| tree | 011f8a2c3a3f10a1cf3a25db7411a0fe6059d700 | |
| parent | de82c453322d7b852d569865af2118696cbf0271 (diff) | |
| download | gcc-dadb19e068ada9ee77d36be1c1bd14730d0493cd.zip gcc-dadb19e068ada9ee77d36be1c1bd14730d0493cd.tar.gz gcc-dadb19e068ada9ee77d36be1c1bd14730d0493cd.tar.bz2 | |
re PR c++/35078 (ICE with reference in parallel for loop)
PR c++/35078
* parser.c (cp_parser_omp_for_loop): If DECL has REFERENCE_TYPE, don't
call cp_finish_decl.
* semantics.c (finish_omp_for): Fail if DECL doesn't have integral type
early.
* g++.dg/gomp/pr35078.C: New test.
From-SVN: r132424
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 7 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gomp/pr35078.C | 20 |
5 files changed, 48 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6789236..79ecec2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2008-02-19 Jakub Jelinek <jakub@redhat.com> + + PR c++/35078 + * parser.c (cp_parser_omp_for_loop): If DECL has REFERENCE_TYPE, don't + call cp_finish_decl. + * semantics.c (finish_omp_for): Fail if DECL doesn't have integral type + early. + 2008-02-15 Douglas Gregor <doug.gregor@gmail.com> PR c++/35023 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5f21574..a5bd055 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -20074,8 +20074,11 @@ cp_parser_omp_for_loop (cp_parser *parser) init = cp_parser_assignment_expression (parser, false); - cp_finish_decl (decl, NULL_TREE, /*init_const_expr_p=*/false, - asm_specification, LOOKUP_ONLYCONVERTING); + if (TREE_CODE (TREE_TYPE (decl)) == REFERENCE_TYPE) + init = error_mark_node; + else + cp_finish_decl (decl, NULL_TREE, /*init_const_expr_p=*/false, + asm_specification, LOOKUP_ONLYCONVERTING); if (pushed_scope) pop_scope (pushed_scope); diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 49dd80e..44c1e3f 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3903,6 +3903,16 @@ finish_omp_for (location_t locus, tree decl, tree init, tree cond, return NULL; } + if (!INTEGRAL_TYPE_P (TREE_TYPE (decl))) + { + location_t elocus = locus; + + if (EXPR_HAS_LOCATION (init)) + elocus = EXPR_LOCATION (init); + error ("%Hinvalid type for iteration variable %qE", &elocus, decl); + return NULL; + } + if (pre_body == NULL || IS_EMPTY_STMT (pre_body)) pre_body = NULL; else if (! processing_template_decl) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 425549d..e25dfc9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-02-19 Jakub Jelinek <jakub@redhat.com> + + PR c++/35078 + * g++.dg/gomp/pr35078.C: New test. + 2008-02-19 Christian Bruel <christian.bruel@st.com> * gcc.dg/packed-array.c: New testcase. diff --git a/gcc/testsuite/g++.dg/gomp/pr35078.C b/gcc/testsuite/g++.dg/gomp/pr35078.C new file mode 100644 index 0000000..1f0d9ec --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr35078.C @@ -0,0 +1,20 @@ +// PR c++/35078 +// { dg-do compile } +// { dg-options "-fopenmp" } + +template<int> void +foo () +{ +#pragma omp parallel for + for (int& i = 0; i < 10; ++i) // { dg-error "invalid type for iteration variable" } + ; +} + +void +bar () +{ + int j = 0; +#pragma omp parallel for + for (int& i = j; i < 10; ++i) // { dg-error "invalid type for iteration variable" } + ; +} |