diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-01-01 21:19:53 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-01-01 21:19:53 +0000 |
| commit | cf015ca24045bf34c6f22951d2d190eb31248d21 (patch) | |
| tree | 9c2c1f6c1a96bb6a3b4bef4e0117071bd257cd0a /gcc | |
| parent | 730832cd7921eb240793634b86d3d026bba58117 (diff) | |
| download | gcc-cf015ca24045bf34c6f22951d2d190eb31248d21.zip gcc-cf015ca24045bf34c6f22951d2d190eb31248d21.tar.gz gcc-cf015ca24045bf34c6f22951d2d190eb31248d21.tar.bz2 | |
re PR fortran/82743 (uncaught character truncation in derived type initialization)
2019-01-01 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/82743
* primary.c (gfc_convert_to_structure_constructor): If a character
in a constructor is too long, add a warning with
-Wcharacter-truncation.
2019-01-01 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/82743
* gfortran.dg/structure_constructor_16.f90: New test.
From-SVN: r267499
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/primary.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/structure_constructor_16.f90 | 14 |
4 files changed, 32 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3af5510..245772de 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2019-01-01 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/82743 + * primary.c (gfc_convert_to_structure_constructor): If a character + in a constructor is too long, add a warning with + -Wcharacter-truncation. + 2019-01-01 Jakub Jelinek <jakub@redhat.com> Update copyright years. diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index d7bd6d6..19f97d1 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -3074,6 +3074,12 @@ gfc_convert_to_structure_constructor (gfc_expr *e, gfc_symbol *sym, gfc_expr **c actual->expr->value.character.length = c; actual->expr->value.character.string = dest; + + if (warn_line_truncation && c < e) + gfc_warning_now (OPT_Wcharacter_truncation, + "CHARACTER expression will be truncated " + "in constructor (%ld/%ld) at %L", (long int) c, + (long int) e, &actual->expr->where); } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a309a95..22534b9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-01 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/82743 + * gfortran.dg/structure_constructor_16.f90: New test. + 2019-01-01 Jan Hubicka <hubicka@ucw.cz> * g++.dg/ipa/devirt-36.C: Add dg-do-compile. diff --git a/gcc/testsuite/gfortran.dg/structure_constructor_16.f90 b/gcc/testsuite/gfortran.dg/structure_constructor_16.f90 new file mode 100644 index 0000000..93e8a3f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/structure_constructor_16.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! { dg-additional-options "-Wcharacter-truncation" } +! PR 82743 - warnings were missing on truncation of structure +! constructors. +! Original test case by Simon Klüpfel +PROGRAM TEST + TYPE A + CHARACTER(LEN=1) :: C + END TYPE A + TYPE(A) :: A1 + A1=A("123") ! { dg-warning "CHARACTER expression will be truncated" } + A1=A(C="123") ! { dg-warning "CHARACTER expression will be truncated" } + A1%C="123" ! { dg-warning "CHARACTER expression will be truncated" } +END PROGRAM TEST |