diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2018-03-01 11:06:18 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2018-03-01 11:06:18 +0000 |
| commit | 71a93e81a3a0b574a88364772d1074be9a7e68f6 (patch) | |
| tree | b901d3c51b3f8651d60c1ff12fe4c431739bc5ff | |
| parent | b120c8b207d33f00b34fad9256740d6483839d2b (diff) | |
| download | gcc-71a93e81a3a0b574a88364772d1074be9a7e68f6.zip gcc-71a93e81a3a0b574a88364772d1074be9a7e68f6.tar.gz gcc-71a93e81a3a0b574a88364772d1074be9a7e68f6.tar.bz2 | |
re PR fortran/84219 (Failure to generate error for IO of transfer intrinsic, when MOLD has derived type components.)
2018-03-01 Paul Thomas <pault@gcc.gnu.org>
PR fortran/84219
* target-memory.c (gfc_interpret_derived): Assert that BT_VOID
components are caf tokens.
(gfc_target_interpret_expr): Treat BT_VOID expressions as
integers.
2018-03-01 Paul Thomas <pault@gcc.gnu.org>
PR fortran/84219
* gfortran.dg/coarray_47.f90: New test.
From-SVN: r258098
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/target-memory.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/coarray_47.f90 | 13 |
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fd522b6..742b83d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,13 @@ 2018-03-01 Paul Thomas <pault@gcc.gnu.org> + PR fortran/84219 + * target-memory.c (gfc_interpret_derived): Assert that BT_VOID + components are caf tokens. + (gfc_target_interpret_expr): Treat BT_VOID expressions as + integers. + +2018-03-01 Paul Thomas <pault@gcc.gnu.org> + PR fortran/84538 * class.c (class_array_ref_detected): Remove the condition that there be no reference after the array reference. diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c index e445fbe..6b9292b 100644 --- a/gcc/fortran/target-memory.c +++ b/gcc/fortran/target-memory.c @@ -547,6 +547,7 @@ gfc_interpret_derived (unsigned char *buffer, size_t buffer_size, gfc_expr *resu gcc_assert (ptr % 8 == 0); ptr = ptr/8 + TREE_INT_CST_LOW (DECL_FIELD_OFFSET (cmp->backend_decl)); + gcc_assert (e->ts.type != BT_VOID || cmp->attr.caf_token); gfc_target_interpret_expr (&buffer[ptr], buffer_size - ptr, e, true); } @@ -602,6 +603,13 @@ gfc_target_interpret_expr (unsigned char *buffer, size_t buffer_size, gcc_assert (result->representation.length >= 0); break; + case BT_VOID: + /* This deals with caf_tokens. */ + result->representation.length = + gfc_interpret_integer (result->ts.kind, buffer, buffer_size, + result->value.integer); + break; + default: gfc_internal_error ("Invalid expression in gfc_target_interpret_expr."); break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5347544..e4ed421 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2018-03-01 Paul Thomas <pault@gcc.gnu.org> + PR fortran/84219 + * gfortran.dg/coarray_47.f90: New test. + +2018-03-01 Paul Thomas <pault@gcc.gnu.org> + PR fortran/84538 * gfortran.dg/class_array_23.f03: New test. diff --git a/gcc/testsuite/gfortran.dg/coarray_47.f90 b/gcc/testsuite/gfortran.dg/coarray_47.f90 new file mode 100644 index 0000000..c33eb9c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/coarray_47.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! { dg-options "-fcoarray=single" } +! +! Contributed by G Steinmetz <gscfq@t-online.de> +! +program p + type t + integer, allocatable :: t + end type + type(t) :: x + integer :: i = -1 + print *, transfer(i, x) ! { dg-error "cannot have ALLOCATABLE components" } +end |