OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c/69798 (ICE on invalid code on x86_64-linux-gnu in c_parser_braced_init, at c/c-parser.c:4338) 

PR c/69798
	* c-parser.c (c_parser_postfix_expression): Call
	c_parser_cast_expression rather than c_parser_postfix_expression.

	* gcc.dg/cilk-plus/pr69798-1.c: New test.
	* gcc.dg/cilk-plus/pr69798-2.c: New test.

From-SVN: r233965
This commit is contained in:
Marek Polacek 2016-03-04 13:26:25 +00:00 committed by Marek Polacek
parent a6bf62d5f8
commit 7ff6ca3899
5 changed files with 162 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/c/ChangeLog
View File

@ -1,3 +1,9 @@
2016-03-04 Marek Polacek <polacek@redhat.com>
PR c/69798
* c-parser.c (c_parser_postfix_expression): Call
c_parser_cast_expression rather than c_parser_postfix_expression.
2016-03-01 Jakub Jelinek <jakub@redhat.com>
PR c/69796

10
gcc/c/c-parser.c
View File

@ -8024,8 +8024,8 @@ c_parser_postfix_expression (c_parser *parser)
{
error_at (loc, "-fcilkplus must be enabled to use "
"%<_Cilk_spawn%>");
expr = c_parser_postfix_expression (parser);
expr.value = error_mark_node;
expr = c_parser_cast_expression (parser, NULL);
expr.value = error_mark_node;
}
else if (c_parser_peek_token (parser)->keyword == RID_CILK_SPAWN)
{
@ -8034,14 +8034,14 @@ c_parser_postfix_expression (c_parser *parser)
/* Now flush out all the _Cilk_spawns. */
while (c_parser_peek_token (parser)->keyword == RID_CILK_SPAWN)
c_parser_consume_token (parser);
expr = c_parser_postfix_expression (parser);
expr = c_parser_cast_expression (parser, NULL);
}
else
{
expr = c_parser_postfix_expression (parser);
expr = c_parser_cast_expression (parser, NULL);
expr.value = build_cilk_spawn (loc, expr.value);
}
break;
break;
default:
c_parser_error (parser, "expected expression");
expr.value = error_mark_node;

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2016-03-04 Marek Polacek <polacek@redhat.com>
PR c/69798
* gcc.dg/cilk-plus/pr69798-1.c: New test.
* gcc.dg/cilk-plus/pr69798-2.c: New test.
2016-03-04 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
PR target/70004

73
gcc/testsuite/gcc.dg/cilk-plus/pr69798-1.c Normal file
View File

@ -0,0 +1,73 @@
/* PR c/69798 */
/* { dg-do compile } */
/* { dg-options "-fcilkplus" } */
extern int foo (void);
void
fn1 (int i, int *p)
{
l:
_Cilk_spawn (void); /* { dg-error "expected expression" } */
_Cilk_spawn (char []); /* { dg-error "expected expression" } */
_Cilk_spawn (int *); /* { dg-error "expected expression" } */
_Cilk_spawn (int) 1; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn ({}); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn ++i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn i++; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn --i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn i--; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn &i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn +i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn -i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn ~i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn !i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn *p; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn &&l; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn sizeof (i); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn sizeof (short); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __alignof__ (i); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __alignof__ (short); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __extension__ i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __func__; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn p[0]; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __real__ i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __imag__ i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn !foo (); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn ~foo (); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn (unsigned) foo (); /* { dg-error "only function calls can be spawned" } */
}
void
fn2 (int i, int *p)
{
l:
_Cilk_spawn _Cilk_spawn (void); /* { dg-error "consecutive|expected expression" } */
_Cilk_spawn _Cilk_spawn (char []); /* { dg-error "consecutive|expected expression" } */
_Cilk_spawn _Cilk_spawn (int *); /* { dg-error "consecutive|expected expression" } */
_Cilk_spawn _Cilk_spawn (int) 1; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn ({}); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn ++i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn i++; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn --i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn i--; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn &i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn +i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn -i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn ~i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn !i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn *p; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn &&l; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn sizeof (i); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn sizeof (short); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __alignof__ (i); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __alignof__ (short); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __extension__ i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __func__; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn p[0]; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __real__ i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __imag__ i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn !foo (); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn ~foo (); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn (unsigned) foo (); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
}

72
gcc/testsuite/gcc.dg/cilk-plus/pr69798-2.c Normal file
View File

@ -0,0 +1,72 @@
/* PR c/69798 */
/* { dg-do compile } */
extern int foo (void);
void
fn1 (int i, int *p)
{
l:
_Cilk_spawn (void); /* { dg-error "expected expression" } */
_Cilk_spawn (char []); /* { dg-error "expected expression" } */
_Cilk_spawn (int *); /* { dg-error "expected expression" } */
_Cilk_spawn (int) 1; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn ({}); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn ++i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn i++; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn --i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn i--; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn &i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn +i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn -i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn ~i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn !i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn *p; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn &&l; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn sizeof (i); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn sizeof (short); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __alignof__ (i); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __alignof__ (short); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __extension__ i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __func__; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn p[0]; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __real__ i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn __imag__ i; /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn !foo (); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn ~foo (); /* { dg-error "only function calls can be spawned" } */
_Cilk_spawn (unsigned) foo (); /* { dg-error "only function calls can be spawned" } */
}
void
fn2 (int i, int *p)
{
l:
_Cilk_spawn _Cilk_spawn (void); /* { dg-error "consecutive|expected expression" } */
_Cilk_spawn _Cilk_spawn (char []); /* { dg-error "consecutive|expected expression" } */
_Cilk_spawn _Cilk_spawn (int *); /* { dg-error "consecutive|expected expression" } */
_Cilk_spawn _Cilk_spawn (int) 1; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn ({}); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn ++i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn i++; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn --i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn i--; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn &i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn +i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn -i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn ~i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn !i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn *p; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn &&l; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn sizeof (i); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn sizeof (short); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __alignof__ (i); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __alignof__ (short); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __extension__ i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __func__; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn p[0]; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __real__ i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn __imag__ i; /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn !foo (); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn ~foo (); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
_Cilk_spawn _Cilk_spawn (unsigned) foo (); /* { dg-error "consecutive ._Cilk_spawn. keywords are not permitted" } */
}