procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix logic bug in Cilk Plus array expansion

Browse source 
gcc/cp/ChangeLog:

	* cp-array-notation.c (cp_expand_cond_array_notations): Return
	error_mark_node only if find_rank failed, not if it was
	successful.

gcc/testsuite/ChangeLog:

	* c-c++-common/cilk-plus/AN/an-if.c: Check that the original
	dump does not contain an error_mark_node.
	* c-c++-common/cilk-plus/CK/pr60469.c: Likewise.
	* c-c++-common/cilk-plus/AN/fn_ptr-2.c: New xfail'd test.

From-SVN: r232462
This commit is contained in:
Patrick Palka 2016-01-16 02:30:14 +00:00
parent aa2500e9bc
commit 203484bb27
6 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2016-01-16 Patrick Palka <ppalka@gcc.gnu.org>
* cp-array-notation.c (cp_expand_cond_array_notations): Return
error_mark_node only if find_rank failed, not if it was
successful.
2016-01-16 Patrick Palka <ppalka@gcc.gnu.org>
PR c++/68936

4
gcc/cp/cp-array-notation.c
View file

@ -807,8 +807,8 @@ cp_expand_cond_array_notations (tree orig_stmt)
if (!find_rank (EXPR_LOCATION (cond), cond, cond, true, &cond_rank)
|| !find_rank (EXPR_LOCATION (yes_expr), yes_expr, yes_expr, true,
&yes_rank)
|| find_rank (EXPR_LOCATION (no_expr), no_expr, no_expr, true,
&no_rank))
|| !find_rank (EXPR_LOCATION (no_expr), no_expr, no_expr, true,
&no_rank))
return error_mark_node;
/* If the condition has a zero rank, then handle array notations in body
separately. */

7
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2016-01-16 Patrick Palka <ppalka@gcc.gnu.org>
* c-c++-common/cilk-plus/AN/an-if.c: Check that the original
dump does not contain an error_mark_node.
* c-c++-common/cilk-plus/CK/pr60469.c: Likewise.
* c-c++-common/cilk-plus/AN/fn_ptr-2.c: New xfail'd test.
2016-01-16 Patrick Palka <ppalka@gcc.gnu.org>
PR c++/68936

5
gcc/testsuite/c-c++-common/cilk-plus/AN/an-if.c
View file

@ -1,5 +1,5 @@
/* { dg-do run } */
/* { dg-options "-fcilkplus" } */
/* { dg-options "-fcilkplus -fdump-tree-original" } */
#if HAVE_IO
#include <stdio.h>
@ -46,3 +46,6 @@ int main() {
}
return 0;
}
/* The C++ FE once emitted a bogus error_mark_node for this test case. */
/* { dg-final { scan-tree-dump-not "<<< error >>>" "original" } } */

14
gcc/testsuite/c-c++-common/cilk-plus/AN/fn_ptr-2.c Normal file
View file

@ -0,0 +1,14 @@
/* { dg-do compile } */
/* { dg-options "-fcilkplus" } */
typedef void (*f) (void *);
f b[1024];
void *c[1024][1024];
int
main (void)
{
(b[:]) (c[:][:]); /* { dg-error "rank mismatch" "" { xfail *-*-* } } */
return 0;
}

5
gcc/testsuite/c-c++-common/cilk-plus/CK/pr60469.c
View file

@ -1,6 +1,6 @@
/* PR middle-end/60469 */
/* { dg-do compile } */
/* { dg-options "-fcilkplus" } */
/* { dg-options "-fcilkplus -fdump-tree-original" } */
void foo() {}
@ -13,3 +13,6 @@ int main(int argc, char* argv[])
_Cilk_spawn foo();
return 0;
}
/* The C++ FE once emitted a bogus error_mark_node for this test case. */
/* { dg-final { scan-tree-dump-not "<<< error >>>" "original" } } */