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

gcc/fortran/ChangeLog:

2015-11-27  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-27  Andre Vehreschild  <vehre@gcc.gnu.org>

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

From-SVN: r231017

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 33270a1c24fb5eb89bfd9674945cdedbac00f3e8..c0cba462fd74f3620061731848274fe2fcc18767 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-27  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-25  Paul Thomas  <pault@gcc.gnu.org>
 
        Backport from trunk.

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 877e37109a9b99db2b8cb206407ab78dbcf60004..4928adf6d1e575a5ed60c4834660adfa26f35683 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -4976,6 +4976,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 1b8f0d48328c033f6aa476b2d2c6714dcef25a87..04a355bcd176c0c44714c19c8d82b9833ba656d0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-27  Andre Vehreschild  <vehre@gcc.gnu.org>
+
+       PR fortran/68218
+       * gfortran.dg/allocate_with_arrayspec_1.f90: New test.
+
 2015-11-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        Backport from mainline

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" } }