2010-05-15 Janus Weil <janus@gcc.gnu.org>

	PR fortran/44154
	PR fortran/42647
	* trans-decl.c (gfc_trans_deferred_vars): Modify ordering of
	if branches.

2010-05-15  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/44154
	PR fortran/42647
	* gfortran.dg/allocatable_scalar_9.f90: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159445 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index dd6d23f..2b2bc9b 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,12 @@
 2010-05-15  Janus Weil  <janus@gcc.gnu.org>
 
+       PR fortran/44154
+       PR fortran/42647
+       * trans-decl.c (gfc_trans_deferred_vars): Modify ordering of
+       if branches.
+
+2010-05-15  Janus Weil  <janus@gcc.gnu.org>
+
        PR fortran/43207
        PR fortran/43969
        * gfortran.h (gfc_class_null_initializer): New prototype.

diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 4f0256a..56c88bc 100644 (file)
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -3259,8 +3259,6 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, tree fnbody)
          if (sym_has_alloc_comp && !seen_trans_deferred_array)
            fnbody = gfc_trans_deferred_array (sym, fnbody);
        }
-      else if (sym_has_alloc_comp)
-       fnbody = gfc_trans_deferred_array (sym, fnbody);
       else if (sym->attr.allocatable
               || (sym->ts.type == BT_CLASS
                   && sym->ts.u.derived->components->attr.allocatable))
@@ -3298,6 +3296,8 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, tree fnbody)
              fnbody = gfc_finish_block (&block);
            }
        }
+      else if (sym_has_alloc_comp)
+       fnbody = gfc_trans_deferred_array (sym, fnbody);
       else if (sym->ts.type == BT_CHARACTER)
        {
          gfc_get_backend_locus (&loc);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b41cfac..ded582b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-15  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/44154
+       PR fortran/42647
+       * gfortran.dg/allocatable_scalar_9.f90: New.
+
 2010-05-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/44148