diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-01-04 10:42:12 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-01-04 10:42:12 +0000 |
| commit | a52fcfac0a9621e4ee5345272873d96f55ad3d18 (patch) | |
| tree | 058cf07917960d296137c3320c1e7f69c6704b3a | |
| parent | 9d3ac5e3dbd66b76cdbc13128d0991a5775a6d08 (diff) | |
| download | gcc-a52fcfac0a9621e4ee5345272873d96f55ad3d18.zip gcc-a52fcfac0a9621e4ee5345272873d96f55ad3d18.tar.gz gcc-a52fcfac0a9621e4ee5345272873d96f55ad3d18.tar.bz2 | |
re PR fortran/48543 (Collapse identical strings)
2019-01-04 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/48543
* gfortran.dg/const_chararacter_merge.f90: Actually remove.
* gfortran.dg/merge_char_const.f90: Restore.
From-SVN: r267572
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/const_chararacter_merge.f90 | 11 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/merge_char_const.f90 | 13 |
3 files changed, 19 insertions, 11 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 47fabcc..a86473e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-01-04 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/48543 + * gfortran.dg/const_chararacter_merge.f90: Actually remove. + * gfortran.dg/merge_char_const.f90: Restore. + 2019-01-04 Jakub Jelinek <jakub@redhat.com> PR target/88594 diff --git a/gcc/testsuite/gfortran.dg/const_chararacter_merge.f90 b/gcc/testsuite/gfortran.dg/const_chararacter_merge.f90 deleted file mode 100644 index 47df562..0000000 --- a/gcc/testsuite/gfortran.dg/const_chararacter_merge.f90 +++ /dev/null @@ -1,11 +0,0 @@ -! { dg-do compile } -! { dg-options "-Os" } -! PR 48543 -program main - character(len=17) :: a - character(len=34) :: b - a = 'Supercalifragilis' - b = 'Supercalifragilisticexpialidocious' - print *,a," ",b -end program main -! { dg-final { scan-assembler-times "Supercalifragilis" 1 } } diff --git a/gcc/testsuite/gfortran.dg/merge_char_const.f90 b/gcc/testsuite/gfortran.dg/merge_char_const.f90 new file mode 100644 index 0000000..32c87f5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/merge_char_const.f90 @@ -0,0 +1,13 @@ +! { dg-do run } +! { dg-options "-O0" } +! This tests the patch for PR24311 in which the PRINT statement would +! ICE on trying to print a MERGE statement with character constants +! for the first two arguments. +! +! Contributed by Paul Thomas <pault@gcc.gnu.org> +! + integer, dimension(6) :: i = (/1,0,0,1,1,0/) + print '(6a1)', Merge ("a", "b", i == 1) ! { dg-output "abbaab" } + end + + |