diff options
| author | Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de> | 2004-06-14 20:50:44 +0200 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2004-06-14 20:50:44 +0200 |
| commit | 7031baf4de70d1f280df2c3837861ca042ae79b8 (patch) | |
| tree | 27a33ac55c433ba5387fb8cf06aaf3598f5881a7 /gcc | |
| parent | f1c3e0a60cd1fd42147cb79c8ee19d6a0f224303 (diff) | |
| download | gcc-7031baf4de70d1f280df2c3837861ca042ae79b8.zip gcc-7031baf4de70d1f280df2c3837861ca042ae79b8.tar.gz gcc-7031baf4de70d1f280df2c3837861ca042ae79b8.tar.bz2 | |
re PR fortran/15211 (ICE with LEN intrinsic)
fortran/
PR fortran/15211
* trans-intrinsic.c (gfc_conv_intrinsic_len): Deal with arrays
of strings.
testsuite/
PR fortran/15211
* gfortran.fortran-torture/execute/intrinsic_len.f90: Also test
LEN of a character array.
From-SVN: r83126
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_len.f90 | 9 |
4 files changed, 26 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 47b7e24..04e5290 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2004-05-31 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + PR fortran/15211 + * trans-intrinsic.c (gfc_conv_intrinsic_len): Deal with arrays + of strings. + 2004-06-14 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> PR fortran/15510 diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index e2c1b7e..67b6cc4 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -1874,8 +1874,12 @@ gfc_conv_intrinsic_len (gfc_se * se, gfc_expr * expr) break; default: - if (arg->expr_type == EXPR_VARIABLE && arg->ref == NULL) + if (arg->expr_type == EXPR_VARIABLE && arg->ref == NULL + || (arg->ref->next == NULL && arg->ref->type == REF_ARRAY)) { + /* This doesn't catch all cases. + See http://gcc.gnu.org/ml/fortran/2004-06/msg00165.html + and the surrounding thread. */ sym = arg->symtree->n.sym; decl = gfc_get_symbol_decl (sym); if (decl == current_function_decl && sym->attr.function diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0bff3ab..36cb478 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-06-14 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + PR fortran/15211 + * gfortran.fortran-torture/execute/intrinsic_len.f90: Also test + LEN of a character array. + 2004-06-14 Mark Mitchell <mark@codesourcery.com> PR c++/15096 diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_len.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_len.f90 index 6721738..9db8d40 100644 --- a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_len.f90 +++ b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_len.f90 @@ -12,6 +12,7 @@ program test if ((a .ne. "01234567") .or. (n .ne. 8)) call abort if (len(Tom%name) .ne. 10) call abort + call array_test() end function w(i) @@ -20,3 +21,11 @@ function w(i) w = "01234567" i = len(w) end + +! This is the testcase from PR 15211 converted to a subroutine +subroutine array_test + implicit none + character(len=10) a(4) + if (len(a) .NE. 10) call abort() +end subroutine array_test + |