diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-06-08 21:10:49 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-06-08 21:10:49 +0200 |
| commit | 8ab7005b1420687c0e31a28a4e6e9fd05bb7f22e (patch) | |
| tree | aec1d25f339f1ecbb52d004325a72dfac4ffc379 /gcc | |
| parent | 20e96b489ea501861c0bb6e509888275d682ed2f (diff) | |
| download | gcc-8ab7005b1420687c0e31a28a4e6e9fd05bb7f22e.zip gcc-8ab7005b1420687c0e31a28a4e6e9fd05bb7f22e.tar.gz gcc-8ab7005b1420687c0e31a28a4e6e9fd05bb7f22e.tar.bz2 | |
re PR c/81006 (ICE with zero-size array and #pragma omp task depend)
PR c/81006
* c-typeck.c (handle_omp_array_sections_1): Convert TYPE_MAX_VALUE
to sizetype before size_binop.
* semantics.c (handle_omp_array_sections_1): Convert TYPE_MAX_VALUE
to sizetype before size_binop.
* c-c++-common/gomp/pr81006.c: New test.
From-SVN: r249035
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c/c-typeck.c | 6 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/gomp/pr81006.c | 10 |
6 files changed, 29 insertions, 6 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 0f23eb3..e94bcea 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2017-06-08 Jakub Jelinek <jakub@redhat.com> + + PR c/81006 + * c-typeck.c (handle_omp_array_sections_1): Convert TYPE_MAX_VALUE + to sizetype before size_binop. + 2017-06-07 Jakub Jelinek <jakub@redhat.com> * gimple-parser.c (c_parser_parse_gimple_body): Use TDI_gimple instead diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 92aab54..00e16e8 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -12364,9 +12364,9 @@ handle_omp_array_sections_1 (tree c, tree t, vec<tree> &types, && TREE_CODE (TYPE_MAX_VALUE (TYPE_DOMAIN (type))) == INTEGER_CST) { - tree size = size_binop (PLUS_EXPR, - TYPE_MAX_VALUE (TYPE_DOMAIN (type)), - size_one_node); + tree size + = fold_convert (sizetype, TYPE_MAX_VALUE (TYPE_DOMAIN (type))); + size = size_binop (PLUS_EXPR, size, size_one_node); if (TREE_CODE (low_bound) == INTEGER_CST) { if (tree_int_cst_lt (size, low_bound)) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bb0466d..38b04fa 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2017-06-08 Jakub Jelinek <jakub@redhat.com> + PR c/81006 + * semantics.c (handle_omp_array_sections_1): Convert TYPE_MAX_VALUE + to sizetype before size_binop. + PR c++/81011 * cp-gimplify.c (cxx_omp_finish_clause): When changing clause to OMP_CLAUSE_SHARED, also clear OMP_CLAUSE_SHARED_FIRSTPRIVATE diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 99c61e5..94de17f 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -4731,9 +4731,9 @@ handle_omp_array_sections_1 (tree c, tree t, vec<tree> &types, && TREE_CODE (TYPE_MAX_VALUE (TYPE_DOMAIN (type))) == INTEGER_CST) { - tree size = size_binop (PLUS_EXPR, - TYPE_MAX_VALUE (TYPE_DOMAIN (type)), - size_one_node); + tree size + = fold_convert (sizetype, TYPE_MAX_VALUE (TYPE_DOMAIN (type))); + size = size_binop (PLUS_EXPR, size, size_one_node); if (TREE_CODE (low_bound) == INTEGER_CST) { if (tree_int_cst_lt (size, low_bound)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 956f400..ca08626 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2017-06-08 Jakub Jelinek <jakub@redhat.com> + PR c/81006 + * c-c++-common/gomp/pr81006.c: New test. + PR c++/81011 * g++.dg/gomp/pr81011.C: New test. diff --git a/gcc/testsuite/c-c++-common/gomp/pr81006.c b/gcc/testsuite/c-c++-common/gomp/pr81006.c new file mode 100644 index 0000000..a826c5f --- /dev/null +++ b/gcc/testsuite/c-c++-common/gomp/pr81006.c @@ -0,0 +1,10 @@ +/* PR c/81006 */ +/* { dg-do compile } */ + +int a[] = {}; + +void foo() +{ + #pragma omp task depend(out: a[:]) /* { dg-error "zero length array section in .depend. clause" } */ + {} +} |