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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3af551012b91d385327a83b1ea52444ab27b4608..245772de244e1509dd0b4ed3cfb31f2c7e8e39f1 100644 (file)
--- 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 d7bd6d6cd9ce31f0131367be4b441130a88a9bf6..19f97d1cb191a59d1bea0d3909d07c7119704798 100644 (file)
--- 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 a309a9567a5885d478cab4cd18f9501583610eae..22534b93ecbca4baa2570ff4e65893859be4fb05 100644 (file)
--- 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 (file)
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