From 54a990d324f731560ccf4eaec64c6ec9da33eb7d Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Fri, 3 Jan 2014 21:24:50 +0100 Subject: [PATCH] re PR c++/58567 (ICE with invalid loop variable in template using openmp) 2014-01-03 Tobias Burnus PR c++/58567 * pt.c (tsubst_omp_for_iterator): Early return for * error_mark_node. 2014-01-03 Tobias Burnus PR c++/58567 * g++.dg/gomp/pr58567.C: New. From-SVN: r206322 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/gomp/pr58567.C | 15 +++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 gcc/testsuite/g++.dg/gomp/pr58567.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e89bc50..7021108 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-01-03 Tobias Burnus + + PR c++/58567 + * pt.c (tsubst_omp_for_iterator): Early return for error_mark_node. + 2014-01-03 Paolo Carlini Core DR 1442 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 3b8f83a..98d7365 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13035,6 +13035,10 @@ tsubst_omp_for_iterator (tree t, int i, tree declv, tree initv, init_decl = (init && TREE_CODE (init) == DECL_EXPR); init = RECUR (init); decl = RECUR (decl); + + if (decl == error_mark_node || init == error_mark_node) + return; + if (init_decl) { gcc_assert (!processing_template_decl); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b763961..ebf4034 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-01-03 Tobias Burnus + + PR c++/58567 + * g++.dg/gomp/pr58567.C: New. + 2014-01-03 Bingfeng Mei PR tree-optimization/59651 diff --git a/gcc/testsuite/g++.dg/gomp/pr58567.C b/gcc/testsuite/g++.dg/gomp/pr58567.C new file mode 100644 index 0000000..35a5bb0 --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr58567.C @@ -0,0 +1,15 @@ +/* { dg-do compile } */ + +/* PR c++/58567 - was ICEing before */ + +template void foo() +{ + #pragma omp parallel for + for (typename T::X i = 0; i < 100; ++i) /* { dg-error "'int' is not a class, struct, or union type|expected iteration declaration or initialization" } */ + ; +} + +void bar() +{ + foo(); +} -- 2.7.4