2012-06-22 Tobias Burnus <burnus@net-b.de>

        Backport from mainline
        2012-06-17  Tobias Burnus  <burnus@net-b.de>

        PR fortran/53691
        PR fortran/53685
        * check.c (gfc_calculate_transfer_sizes): Return if
        SIZE= is not constant or source-size cannot be determined.

2012-06-22  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline
        2012-06-17  Tobias Burnus  <burnus@net-b.de>

        PR fortran/53691
        PR fortran/53685
        * gfortran.dg/transfer_check_3.f90: New.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188882 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 58 insertions, 2 deletions

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8ba78efd51d..eadb6fbc728 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2012-06-22  Tobias Burnus  <burnus@net-b.de>
+
+	Backport from mainline
+	2012-06-17  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/53691
+	PR fortran/53685
+	* check.c (gfc_calculate_transfer_sizes): Return if
+	SIZE= is not constant or source-size cannot be determined.
+
 2012-06-14  Tobias Burnus  <burnus@net-b.de>
 
 	Backport from mainline
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index afeb653a5a8..32e54635005 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -3986,7 +3986,6 @@ gfc_try
 gfc_calculate_transfer_sizes (gfc_expr *source, gfc_expr *mold, gfc_expr *size,
 			      size_t *source_size, size_t *result_size,
 			      size_t *result_length_p)
-
 {
   size_t result_elt_size;
   mpz_t tmp;
@@ -3995,12 +3994,17 @@ gfc_calculate_transfer_sizes (gfc_expr *source, gfc_expr *mold, gfc_expr *size,
   if (source->expr_type == EXPR_FUNCTION)
     return FAILURE;
 
-    /* Calculate the size of the source.  */
+  if (size && size->expr_type != EXPR_CONSTANT)
+    return FAILURE;
+
+  /* Calculate the size of the source.  */
   if (source->expr_type == EXPR_ARRAY
       && gfc_array_size (source, &tmp) == FAILURE)
     return FAILURE;
 
   *source_size = gfc_target_expr_size (source);
+  if (*source_size == 0)
+    return FAILURE;
 
   mold_element = mold->expr_type == EXPR_ARRAY
 		 ? gfc_constructor_first (mold->value.constructor)->expr
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3c6c35efd6f..5484edcf2a7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-22  Tobias Burnus  <burnus@net-b.de>
+
+	Backport from mainline
+	2012-06-17  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/53691
+	PR fortran/53685
+	* gfortran.dg/transfer_check_3.f90: New.
+
 2012-06-22  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/lto15.ad[sb]: New test.
diff --git a/gcc/testsuite/gfortran.dg/transfer_check_3.f90 b/gcc/testsuite/gfortran.dg/transfer_check_3.f90
new file mode 100644
index 00000000000..d0a52c27bdb
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/transfer_check_3.f90
@@ -0,0 +1,33 @@
+! { dg-do compile }
+! { dg-options "-Wsurprising" }
+!
+! PR fortran/53691
+! PR fortran/53685
+!
+! TRANSFER checks
+
+
+! (a) PR 53691
+! Failed for -Wsurprising with an ICE as SIZE was assumed to be constant
+
+       SUBROUTINE CGBRFSX(N, RWORK)
+         INTEGER N
+         REAL RWORK(*)
+         REAL ZERO
+         PARAMETER (ZERO = 0.0E+0)
+         call foo(TRANSFER (RWORK(1:2*N), (/ (ZERO, ZERO) /), N))
+       end
+
+! (b) PR 53685
+! Failed with a bogus size warning if the source's size is not known at compile
+! time (for substrings, the length wasn't set)
+
+      subroutine test(j)
+        implicit none
+        character(len=4) :: record_type
+        integer          :: i, j
+
+        i = transfer (record_type, i)      ! no warning
+        i = transfer (record_type(1:4), i) ! gave a warning
+        i = transfer (record_type(1:j), i) ! gave a warning
+      end