diff options
| author | Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de> | 2004-08-31 18:52:41 +0200 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2004-08-31 18:52:41 +0200 |
| commit | cf73cdac51a20dacfc1b569b0bd6fcef1d71f852 (patch) | |
| tree | f6cf24cccfa3d227eb7e6b581c8e492c97589507 /gcc | |
| parent | bd72d66cb5f8450f631da7149bf066f865d56338 (diff) | |
| download | gcc-cf73cdac51a20dacfc1b569b0bd6fcef1d71f852.zip gcc-cf73cdac51a20dacfc1b569b0bd6fcef1d71f852.tar.gz gcc-cf73cdac51a20dacfc1b569b0bd6fcef1d71f852.tar.bz2 | |
re PR fortran/17244 (gfortran fatal error: gfc_todo: Not Implemented: Returning derived types)
fortran/
PR fortran/17244
* trans-types.c (gfc_return_by_reference): Remove TODO error,
add comment pointing out possible issue WRT compatibility with g77.
testsuite/
PR fortran/17244
* gfortran.dg/func_derived_1.f90: New test.
From-SVN: r86832
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-types.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/func_derived_1.f90 | 38 |
4 files changed, 50 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 74ada4c..a4f76e37 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2004-08-31 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + PR fortran/17244 + * trans-types.c (gfc_return_by_reference): Remove TODO error, + add comment pointing out possible issue WRT compatibility with g77. + +2004-08-31 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + * trans-decl.c, trans-expr.c, trans-io.c, trans-types.c: Replace all occurences of 'gfc_strlen_type_node' by 'gfc_charlen_type_node'. diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index f65a9d7..26866b4 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -1451,9 +1451,7 @@ gfc_return_by_reference (gfc_symbol * sym) if (sym->ts.type == BT_CHARACTER) return 1; - if (sym->ts.type == BT_DERIVED) - gfc_todo_error ("Returning derived types"); - /* Possibly return derived types by reference. */ + /* Possibly return complex numbers by reference for g77 compatibility. */ return 0; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index df86733..86a392c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-08-31 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + PR fortran/17244 + * gfortran.dg/func_derived_1.f90: New test. + 2004-08-31 Paul Brook <paul@codesourcery.com> * gfortran.dg/eof_1.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/func_derived_1.f90 b/gcc/testsuite/gfortran.dg/func_derived_1.f90 new file mode 100644 index 0000000..5160e5a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/func_derived_1.f90 @@ -0,0 +1,38 @@ +! { dg-do run } +! PR 17244 +! verifies that functions returning derived type work +module m + type t + integer i + real x + character*5 c + integer arr(5,5) + end type t +end module m + +use m +type(t) :: r +integer arr(5,5), vect(25), vect2(25) +do i=1,25 + vect = 0 + vect(i) = i + arr = reshape (vect, shape(arr)) + r = f(i,real(i),"HALLO",arr) + + if (r%i .ne. i) call abort() + if (r%x .ne. real(i)) call abort() + if (r%c .ne. "HALLO") call abort() + vect2 = reshape (r%arr, shape(vect2)) + if (any(vect2.ne.vect)) call abort() +end do +contains + +function f(i,x,c,arr) + type(t) :: f + character*5 c + integer arr(5,5) + + f = t(i,x,c,arr) +end function f + +end |