diff options
| author | Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de> | 2004-09-02 01:29:46 +0200 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2004-09-02 01:29:46 +0200 |
| commit | c3d0559da5e101d454cc4e90d67f08d11ea1036c (patch) | |
| tree | 645d3bcde8225440ecfbf1676a7dc7ef7f2d6a7b /gcc/testsuite | |
| parent | 40219f9650a956d7fbff36721fae3a5b761311b1 (diff) | |
| download | gcc-c3d0559da5e101d454cc4e90d67f08d11ea1036c.zip gcc-c3d0559da5e101d454cc4e90d67f08d11ea1036c.tar.gz gcc-c3d0559da5e101d454cc4e90d67f08d11ea1036c.tar.bz2 | |
re PR fortran/15327 (ICE when using MERGE on strings)
fortran/
PR fortran/15327
* trans-intrinsic.c (gfc_conv_intrinsic_merge): Do the right thing for
strings.
testsuite/
PR fortran/15327
* gfortran.dg/merge_char_1.f90: New test.
From-SVN: r86940
Diffstat (limited to 'gcc/testsuite')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/merge_char_1.f90 | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ba2a713..da0463c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2004-09-01 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + PR fortran/15327 + * gfortran.dg/merge_char_1.f90: New test. + +2004-09-01 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + PR fortran/16404 * gfortran.dg/der_io_1.f90: XFAIL illegal testcase. diff --git a/gcc/testsuite/gfortran.dg/merge_char_1.f90 b/gcc/testsuite/gfortran.dg/merge_char_1.f90 new file mode 100644 index 0000000..0a8036d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/merge_char_1.f90 @@ -0,0 +1,7 @@ +! { dg-do run } +! PR 15327 +! The merge intrinsic didn't work for strings +character*2 :: c(2) +c = merge( (/ "AA", "BB" /), (/ "CC", "DD" /), (/ .TRUE., .FALSE. /) ) +if (c(1).ne."AA" .or. c(2).ne."DD") call abort () +end |