diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cp-array-notation.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cilk-plus/AN/array_function.cc | 8 |
4 files changed, 20 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d90e6e3..2021e2d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-05-21 Jonathan Wakely <jwakely@redhat.com> + + PR c/61271 + * cp-array-notation.c (cilkplus_an_triplet_types_ok_p): Fix condition. + 2014-05-21 Ville Voutilainen <ville.voutilainen@gmail.com> PR c++/61133 diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c index 0ff0967..ff82dee 100644 --- a/gcc/cp/cp-array-notation.c +++ b/gcc/cp/cp-array-notation.c @@ -26,7 +26,7 @@ An array notation expression has 4 major components: 1. The array name 2. Start Index - 3. Number of elements we need to acess (we call it length) + 3. Number of elements we need to access (we call it length) 4. Stride So, if we have something like A[0:5:2], we are accessing A[0], A[2], A[4], @@ -1418,7 +1418,7 @@ cilkplus_an_triplet_types_ok_p (location_t loc, tree start_index, tree length, error_at (loc, "stride of array notation triplet is not an integer"); return false; } - if (!TREE_CODE (type) == FUNCTION_TYPE) + if (TREE_CODE (type) == FUNCTION_TYPE) { error_at (loc, "array notation cannot be used with function type"); return false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0641f59..1b9c60a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-05-21 Jonathan Wakely <jwakely@redhat.com> + + PR c/61271 + * g++.dg/cilk-plus/AN/array_function.cc: New. + 2014-05-22 Richard Biener <rguenther@suse.de> * gcc.dg/tree-ssa/alias-33.c: New testcase. diff --git a/gcc/testsuite/g++.dg/cilk-plus/AN/array_function.cc b/gcc/testsuite/g++.dg/cilk-plus/AN/array_function.cc new file mode 100644 index 0000000..b111e21 --- /dev/null +++ b/gcc/testsuite/g++.dg/cilk-plus/AN/array_function.cc @@ -0,0 +1,8 @@ +/* { dg-do compile } */ +/* { dg-options "-fcilkplus" } */ + +void f() { } +int main() +{ + f[0:1:1]; // { dg-error "function type" } +} |