aboutsummaryrefslogtreecommitdiff
path: root/gcc/c/c-parser.c
diff options
context:
space:
mode:
authorBalaji V. Iyer <balaji.v.iyer@intel.com>2014-01-09 13:37:41 +0000
committerBalaji V. Iyer <bviyer@gcc.gnu.org>2014-01-09 05:37:41 -0800
commit9a74f20cd7ebc15e926de399d133103466e68c78 (patch)
treeadb41b0b3fef66103c5e0819878c0ff1e538a137 /gcc/c/c-parser.c
parent63124c486dcd729695fc6ee33fc0ebe74379f589 (diff)
downloadgcc-9a74f20cd7ebc15e926de399d133103466e68c78.zip
gcc-9a74f20cd7ebc15e926de399d133103466e68c78.tar.gz
gcc-9a74f20cd7ebc15e926de399d133103466e68c78.tar.bz2
re PR c++/59631 (ICE using _Cilk_spawn without -fcilkplus)
Fix for PR c++/59631. +++ gcc/cp/ChangeLog +2014-01-09 Balaji V. Iyer <balaji.v.iyer@intel.com> + + PR c++/59631 + * parser.c (cp_parser_postfix_expression): Added a new if-statement + and replaced an existing if-statement with else-if statement. + Changed an existing error message wording to match the one from the C + parser. + +++ gcc/testsuite/ChangeLog +2014-01-09 Balaji V. Iyer <balaji.v.iyer@intel.com> + + PR c++/59631 + * gcc.dg/cilk-plus/cilk-plus.exp: Removed "-fcilkplus" from flags list. + * g++.dg/cilk-plus/cilk-plus.exp: Likewise. + * c-c++-common/cilk-plus/CK/spawnee_inline.c: Replaced second dg-option + with dg-additional-options. + * c-c++-common/cilk-plus/CK/varargs_test.c: Likewise. + * c-c++-common/cilk-plus/CK/steal_check.c: Likewise. + * c-c++-common/cilk-plus/CK/spawner_inline.c: Likewise. + * c-c++-common/cilk-plus/CK/spawning_arg.c: Likewise. + * c-c++-common/cilk-plus/CK/invalid_spawns.c: Added a dg-options tag. + * c-c++-common/cilk-plus/CK/pr59631.c: New testcase. + gcc/c/ChangeLog +2014-01-09 Balaji V. Iyer <balaji.v.iyer@intel.com> + + PR c++/59631 + * c-parser.c (c_parser_postfix_expression): Replaced consecutive if + statements with if-elseif statements. + From-SVN: r206463
Diffstat (limited to 'gcc/c/c-parser.c')
-rw-r--r--gcc/c/c-parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index f73df08..4490210 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -7500,7 +7500,7 @@ c_parser_postfix_expression (c_parser *parser)
expr = c_parser_postfix_expression (parser);
expr.value = error_mark_node;
}
- if (c_parser_peek_token (parser)->keyword == RID_CILK_SPAWN)
+ else if (c_parser_peek_token (parser)->keyword == RID_CILK_SPAWN)
{
error_at (loc, "consecutive %<_Cilk_spawn%> keywords "
"are not permitted");