re PR fortran/50585 (ICE with assumed length character array argument)

2011-10-01  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/50585
	* interface.c (get_expr_storage_size): Check if 'length' component is
	associated.

2011-10-01  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/50585
	* gfortran.dg/assumed_charlen_arg_2.f90: New.

From-SVN: r179413

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ecd9fa3a740a256726e834f4aa7b74babd33bc80..c6bea2a28f7fcf798bfaf33bf083207d36a3abc2 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-01  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/50585
+       * interface.c (get_expr_storage_size): Check if 'length' component is
+       associated.
+
 2011-09-29  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/50547

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index f65087baff12ccd9f6cb20ccb5c65daa154165e3..aa075a9040158425ba76b4173d3cc619b0ae45f2 100644 (file)
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -1959,7 +1959,7 @@ get_expr_storage_size (gfc_expr *e)
            {
              /* The string length is the substring length.
                 Set now to full string length.  */
-             if (ref->u.ss.length == NULL
+             if (!ref->u.ss.length || !ref->u.ss.length->length
                  || ref->u.ss.length->length->expr_type != EXPR_CONSTANT)
                return 0;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d7b163a36f7ce949a9ffbbe259b618050906762a..075edfc4008d727d77b74e4ff9613f7434b23a24 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-01  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/50585
+       * gfortran.dg/assumed_charlen_arg_2.f90: New.
+
 2011-09-30  Janis Johnson  <janisjo@codesourcery.com>
 
        PR c++/44473

diff --git a/gcc/testsuite/gfortran.dg/assumed_charlen_arg_2.f90 b/gcc/testsuite/gfortran.dg/assumed_charlen_arg_2.f90
new file mode 100644 (file)
index 0000000..e9481d8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assumed_charlen_arg_2.f90
@@ -0,0 +1,16 @@
+! { dg-do compile }
+!
+! PR 50585: [4.6/4.7 Regression] ICE with assumed length character array argument
+!
+! Contributed by Stuart Mentzer <sgm@objexx.com>
+
+SUBROUTINE SUB1( str )
+  IMPLICIT NONE
+  CHARACTER(len=*) :: str(2)
+  CALL SUB2( str(1)(:3) )
+END SUBROUTINE
+
+SUBROUTINE SUB2( str )
+  IMPLICIT NONE
+  CHARACTER(*) :: str
+END SUBROUTINE