diff options
| author | James A. Morrison <phython@gcc.gnu.org> | 2005-01-23 17:01:00 +0000 |
|---|---|---|
| committer | Paul Brook <pbrook@gcc.gnu.org> | 2005-01-23 17:01:00 +0000 |
| commit | 587579571db53d68bd90344c6a1746aef98bc145 (patch) | |
| tree | d9ae2043205be06ce0d7a27be58b05e0a8e5c085 /gcc/fortran/iresolve.c | |
| parent | b9750434708d2f3cc276d52c3f772c277fd6f4a7 (diff) | |
| download | gcc-587579571db53d68bd90344c6a1746aef98bc145.zip gcc-587579571db53d68bd90344c6a1746aef98bc145.tar.gz gcc-587579571db53d68bd90344c6a1746aef98bc145.tar.bz2 | |
re PR fortran/19294 (intrinsic_transpose.f90 runtime crash)
2005-01-23 James A. Morrison <phython@gcc.gnu.org>
Paul Brook <paul@codesourcery.com>
PR fortran/19294
* iresolve.c (gfc_resolve_transpose): Resolve to transpose_c4 or
transpose_c8 for complex types.
libgfortran/
* Makefile.am: Add transpose_c4.c and transpose_c8.c.
* intrinsics/cshift0.c: Use separate optimized loops for complex types.
* m4/transpose.m4: Include type letter in function name.
* Makefile.in: Regenerate.
* generated/transpose_*.c: Regenerate.
Co-Authored-By: Paul Brook <paul@codesourcery.com>
From-SVN: r94116
Diffstat (limited to 'gcc/fortran/iresolve.c')
| -rw-r--r-- | gcc/fortran/iresolve.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 60c443e..a4ab225 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -1340,31 +1340,32 @@ gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix) mpz_init_set (f->shape[1], matrix->shape[0]); } - switch (matrix->ts.type) - { - case BT_COMPLEX: - kind = matrix->ts.kind * 2; - break; - - case BT_REAL: - case BT_INTEGER: - case BT_LOGICAL: - kind = matrix->ts.kind; - break; - - default: - kind = 0; - break; - - } + kind = matrix->ts.kind; switch (kind) { case 4: case 8: - /* case 16: */ - f->value.function.name = - gfc_get_string (PREFIX("transpose_%d"), kind); + switch (matrix->ts.type) + { + case BT_COMPLEX: + f->value.function.name = + gfc_get_string (PREFIX("transpose_c%d"), kind); + break; + + case BT_INTEGER: + case BT_REAL: + case BT_LOGICAL: + /* Use the integer routines for real and logical cases. This + assumes they all have the same alignment requirements. */ + f->value.function.name = + gfc_get_string (PREFIX("transpose_i%d"), kind); + break; + + default: + f->value.function.name = PREFIX("transpose"); + break; + } break; default: |