re PR fortran/82934 (Segfault on assumed character length in allocate)

2017-11-10  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/82934
	* trans-stmt.c (gfc_trans_allocate): Remove the gcc_assert on
	null string length for assumed length typespec and set
	expr3_esize to NULL_TREE;

2017-11-10  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/82934
	* gfortran.dg/allocate_assumed_charlen_1.f90: New test.

From-SVN: r254624

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7d016278b262150a6f893e54af7b6dc2fdd9eb2e..fb067aa3d6f27b777fb38696c5a327c5423885f9 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2017-11-10  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/82934
+       * trans-stmt.c (gfc_trans_allocate): Remove the gcc_assert on
+       null string length for assumed length typespec and set
+       expr3_esize to NULL_TREE;
+
 2017-11-09  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/78619

diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index d058e5f449d2036e6206cca004d01f11f082414d..ea0f9529f1c7717809fc756685e2b365dccd0e19 100644 (file)
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -5913,10 +5913,9 @@ gfc_trans_allocate (gfc_code * code)
       if (code->ext.alloc.ts.type != BT_CHARACTER)
        expr3_esize = TYPE_SIZE_UNIT (
              gfc_typenode_for_spec (&code->ext.alloc.ts));
-      else
+      else if (code->ext.alloc.ts.u.cl->length != NULL)
        {
          gfc_expr *sz;
-         gcc_assert (code->ext.alloc.ts.u.cl->length != NULL);
          sz = gfc_copy_expr (code->ext.alloc.ts.u.cl->length);
          gfc_init_se (&se_sz, NULL);
          gfc_conv_expr (&se_sz, sz);
@@ -5930,6 +5929,8 @@ gfc_trans_allocate (gfc_code * code)
                                         tmp, se_sz.expr);
          expr3_esize = gfc_evaluate_now (expr3_esize, &block);
        }
+      else
+       expr3_esize = NULL_TREE;
     }
 
   /* The routine gfc_trans_assignment () already implements all

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a543e4fa404d6d8f72f23089ac977596748a37f9..620044a92a17b7bb72d3d99f094abebfba14b140 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-10  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/82934
+       * gfortran.dg/allocate_assumed_charlen_1.f90: New test.
+
 2017-11-10  Jakub Jelinek  <jakub@redhat.com>
 
        PR bootstrap/82916

diff --git a/gcc/testsuite/gfortran.dg/allocate_assumed_charlen_1.f90 b/gcc/testsuite/gfortran.dg/allocate_assumed_charlen_1.f90
new file mode 100644 (file)
index 0000000..382df36
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/allocate_assumed_charlen_1.f90
@@ -0,0 +1,28 @@
+! { dg-do run }
+!
+! PR82934: Segfault on compilation in trans-stmt.c:5919(8.0.0).
+! The original report only had one item in the allocate list. This
+! has been doubled up to verify that the correct string length is
+! is used in the allocation.
+!
+! Contributed by FortranFan on clf.
+!
+   character(len=42), allocatable :: foo
+   character(len=22), allocatable :: foofoo
+
+   call alloc( foo , foofoo)
+
+   if (len(foo) .ne. 42) call abort
+   if (len(foofoo) .ne. 22) call abort
+
+contains
+
+   subroutine alloc( bar, barbar )
+
+      character(len=*), allocatable :: bar, barbar
+
+      allocate( character(len=*) :: bar , barbar) ! <= Here!
+
+   end subroutine
+
+end