diff options
| author | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-01-11 22:03:53 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-01-11 22:03:53 +0100 |
| commit | da972c05f48637060ae3a3b121f99d1522413b82 (patch) | |
| tree | 52b89022a5b5b913eb3ed34efd5c71cfade6bf23 /gcc/fortran | |
| parent | b13091dd9dbabe7fde4b112c4bfb9be729493c16 (diff) | |
| download | gcc-da972c05f48637060ae3a3b121f99d1522413b82.zip gcc-da972c05f48637060ae3a3b121f99d1522413b82.tar.gz gcc-da972c05f48637060ae3a3b121f99d1522413b82.tar.bz2 | |
re PR middle-end/85956 (ICE in wide_int_to_tree_1, at tree.c:1549)
PR middle-end/85956
PR lto/88733
* tree-inline.h (struct copy_body_data): Add adjust_array_error_bounds
field.
* tree-inline.c (remap_type_1): Formatting fix. If TYPE_MAX_VALUE of
ARRAY_TYPE's TYPE_DOMAIN is newly error_mark_node, replace it with
a dummy "omp dummy var" variable if id->adjust_array_error_bounds.
* omp-low.c (new_omp_context): Set cb.adjust_array_error_bounds.
fortran/
* trans-openmp.c: Include attribs.h.
(gfc_walk_alloc_comps, gfc_omp_clause_linear_ctor): Handle
VAR_DECL max bound with "omp dummy var" attribute like NULL or
error_mark_node - recompute number of elts independently.
testsuite/
* c-c++-common/gomp/pr85956.c: New test.
* g++.dg/gomp/pr88733.C: New test.
From-SVN: r267858
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/fortran/trans-openmp.c | 19 |
2 files changed, 30 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6c5e195..c54da9d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,7 +1,16 @@ +2019-01-11 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/85956 + PR lto/88733 + * trans-openmp.c: Include attribs.h. + (gfc_walk_alloc_comps, gfc_omp_clause_linear_ctor): Handle + VAR_DECL max bound with "omp dummy var" attribute like NULL or + error_mark_node - recompute number of elts independently. + 2019-01-11 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/59345 - * trans-array.c (gfc_conv_parameter_array): Temporary + * trans-array.c (gfc_conv_parameter_array): Temporary arrays generated for expressions do not need to be repacked. 2019-01-10 Steven G. Kargl <kargl@gcc.gnu.org> @@ -103,7 +112,7 @@ 2019-01-01 Steven G. Kargl <kargl@gcc.gnu.org> - * parse.c (decode_statement): Suppress "Unclassifiable statement" + * parse.c (decode_statement): Suppress "Unclassifiable statement" error if previous error messages were emittes. 2019-01-01 Thomas Koenig <tkoenig@gcc.gnu.org> diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 6cbe6c7..1fdb70e 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -43,6 +43,7 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #undef GCC_DIAG_STYLE #define GCC_DIAG_STYLE __gcc_gfc__ +#include "attribs.h" int ompws_flags; @@ -297,10 +298,19 @@ gfc_walk_alloc_comps (tree decl, tree dest, tree var, } else { + bool compute_nelts = false; if (!TYPE_DOMAIN (type) || TYPE_MAX_VALUE (TYPE_DOMAIN (type)) == NULL_TREE || TYPE_MIN_VALUE (TYPE_DOMAIN (type)) == error_mark_node || TYPE_MAX_VALUE (TYPE_DOMAIN (type)) == error_mark_node) + compute_nelts = true; + else if (VAR_P (TYPE_MAX_VALUE (TYPE_DOMAIN (type)))) + { + tree a = DECL_ATTRIBUTES (TYPE_MAX_VALUE (TYPE_DOMAIN (type))); + if (lookup_attribute ("omp dummy var", a)) + compute_nelts = true; + } + if (compute_nelts) { tem = fold_build2 (EXACT_DIV_EXPR, sizetype, TYPE_SIZE_UNIT (type), @@ -912,11 +922,20 @@ gfc_omp_clause_linear_ctor (tree clause, tree dest, tree src, tree add) && (!GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause)) || !POINTER_TYPE_P (type))) { + bool compute_nelts = false; gcc_assert (TREE_CODE (type) == ARRAY_TYPE); if (!TYPE_DOMAIN (type) || TYPE_MAX_VALUE (TYPE_DOMAIN (type)) == NULL_TREE || TYPE_MIN_VALUE (TYPE_DOMAIN (type)) == error_mark_node || TYPE_MAX_VALUE (TYPE_DOMAIN (type)) == error_mark_node) + compute_nelts = true; + else if (VAR_P (TYPE_MAX_VALUE (TYPE_DOMAIN (type)))) + { + tree a = DECL_ATTRIBUTES (TYPE_MAX_VALUE (TYPE_DOMAIN (type))); + if (lookup_attribute ("omp dummy var", a)) + compute_nelts = true; + } + if (compute_nelts) { nelems = fold_build2 (EXACT_DIV_EXPR, sizetype, TYPE_SIZE_UNIT (type), |