re PR fortran/68218 (ALLOCATE with size given by a module function)

gcc/fortran/ChangeLog:

2015-11-08  Andre Vehreschild  <vehre@gcc.gnu.org>

	PR fortran/68218
	* trans-array.c (gfc_array_init_size): Add gfc_evaluate_now() when
	array spec in allocate is a function call.

gcc/testsuite/ChangeLog:

2015-11-08  Andre Vehreschild  <vehre@gcc.gnu.org>

	PR fortran/68218
	* gfortran.dg/allocate_with_arrayspec_1.f90: New test.

From-SVN: r229956

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 21534d286287cf3106a04ba61ef9211918a46403..78644b876b11c6d9f2e15c674ed8bd6e49011db4 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-08  Andre Vehreschild  <vehre@gcc.gnu.org>
+
+       PR fortran/68218
+       * trans-array.c (gfc_array_init_size): Add gfc_evaluate_now() when
+       array spec in allocate is a function call.
+
 2015-11-08  Steven G. Kargl  <kargl@gc.gnu.org>
 
        PR fortran/68224

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 6bbf8cc62799b8f55f2d0518f7aac254646c7be6..e28a5ce3c0bb572ffe45000f84017e103a1b2507 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -5150,6 +5150,8 @@ gfc_array_init_size (tree descriptor, int rank, int corank, tree * poffset,
          gcc_assert (ubound);
          gfc_conv_expr_type (&se, ubound, gfc_array_index_type);
          gfc_add_block_to_block (pblock, &se.pre);
+         if (ubound->expr_type == EXPR_FUNCTION)
+           se.expr = gfc_evaluate_now (se.expr, pblock);
        }
       gfc_conv_descriptor_ubound_set (descriptor_block, descriptor,
                                      gfc_rank_cst[n], se.expr);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f11872fd636efd9d2b374455284888e1818f497f..a95aa8dda8163593e1a19659013360ccf1b78a6e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-08  Andre Vehreschild  <vehre@gcc.gnu.org>
+
+       PR fortran/68218
+       * gfortran.dg/allocate_with_arrayspec_1.f90: New test.
+
 2015-11-08  Steven G. Kargl  <kargl@gc.gnu.org>
 
        PR fortran/68224

diff --git a/gcc/testsuite/gfortran.dg/allocate_with_arrayspec_1.f90 b/gcc/testsuite/gfortran.dg/allocate_with_arrayspec_1.f90
new file mode 100644 (file)
index 0000000..686b612
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/allocate_with_arrayspec_1.f90
@@ -0,0 +1,29 @@
+! { dg-do run }
+! { dg-options "-fdump-tree-original" }
+
+MODULE mo_test
+
+  integer :: n = 0
+CONTAINS
+
+  FUNCTION nquery()
+    INTEGER :: nquery
+    WRITE (0,*) "hello!"
+    n = n + 1
+    nquery = n
+  END FUNCTION nquery
+
+END MODULE mo_test
+
+
+! ----------------------------------------------------------------------
+! MAIN PROGRAM
+! ----------------------------------------------------------------------
+PROGRAM example
+   USE mo_test
+   INTEGER, ALLOCATABLE :: query_buf(:)
+   ALLOCATE(query_buf(nquery()))
+   if (n /= 1 .or. size(query_buf) /= n) call abort()
+END PROGRAM example
+
+! { dg-final { scan-tree-dump-times "nquery" 5 "original" } }