re PR fortran/40847 (segfault & bogus warning)

2009-08-16  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/40847
	* iresolve.c (gfc_resolve_transfer): Correct error in 'mold'
	character length for case where length expresson is NULL.

2009-08-16  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/40847
	* gfortran.dg/transfer_resolve_1.f90 : New test.

From-SVN: r150815

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a8c9aaafa8de23d0ca1dcb1ca696166f291900ec..2b363b4b13deac7b38d8209e35d051e52c2729d2 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-16  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/40847
+       * iresolve.c (gfc_resolve_transfer): Correct error in 'mold'
+       character length for case where length expresson is NULL.
+
 2009-08-16  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/40851

diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index 8511388419585bc0c1595a1348224f51a053f729..22ad4bc695f2e5fffae844380d294c94e7c9ec0e 100644 (file)
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -2317,9 +2317,19 @@ gfc_resolve_transfer (gfc_expr *f, gfc_expr *source ATTRIBUTE_UNUSED,
   /* TODO: Make this do something meaningful.  */
   static char transfer0[] = "__transfer0", transfer1[] = "__transfer1";
 
-  if (mold->ts.type == BT_CHARACTER && !mold->ts.cl->length
-       && !(mold->expr_type == EXPR_VARIABLE && mold->symtree->n.sym->attr.dummy))
-    mold->ts.cl->length = gfc_int_expr (mold->value.character.length);
+  if (mold->ts.type == BT_CHARACTER
+       && !mold->ts.cl->length
+       && gfc_is_constant_expr (mold))
+    {
+      int len;
+      if (mold->expr_type == EXPR_CONSTANT)
+       mold->ts.cl->length = gfc_int_expr (mold->value.character.length);
+      else
+       {
+         len = mold->value.constructor->expr->value.character.length;
+         mold->ts.cl->length = gfc_int_expr (len);
+       }
+    }
 
   f->ts = mold->ts;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eb77199d317a9e386ac92b33346dc3aedd6e76e3..cf67bbaa45348380beec824719dbcd4ec9f2c8d6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-16  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/40847
+       * gfortran.dg/transfer_resolve_1.f90 : New test.
+
 2009-08-16  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/40851

diff --git a/gcc/testsuite/gfortran.dg/transfer_resolve_1.f90 b/gcc/testsuite/gfortran.dg/transfer_resolve_1.f90
new file mode 100644 (file)
index 0000000..8d326a1
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/transfer_resolve_1.f90
@@ -0,0 +1,21 @@
+! { dg-do run }
+! PR40847 - an error in gfc_resolve_transfer caused the character length
+! of 'mold' to be set incorrectly.
+!
+! Contributed by Joost VandeVondele <jv244@cam.ac.uk>
+!
+program test_elemental
+
+if (any (transfer_size((/0.,0./),(/'a','b'/)) .ne. [4 ,4])) call abort
+
+contains
+
+   elemental function transfer_size (source, mold)
+     real, intent(in)         :: source
+     character(*), intent(in) :: mold
+     integer                  :: transfer_size
+     transfer_size = SIZE(TRANSFER(source, (/mold/)))
+     return
+   end function transfer_size
+
+end program test_elemental