From: burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 31 Oct 2012 17:22:26 +0000 (+0000)
Subject: 2012-10-31  Tobias Burnus  <burnus@net-b.de>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74c43d0fd401831d5eef69a77ec67586d6f52746;p=thirdparty%2Fgcc.git

2012-10-31  Tobias Burnus  <burnus@net-b.de>

        PR fortran/55134
        * trans-array.c (gfc_conv_array_parameter): Regard AS_DEFERRED
        * as
        array with descriptor.

2012-10-31  Tobias Burnus  <burnus@net-b.de>

        PR fortran/55134
        * gfortran.dg/associate_11.f90: New.



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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 08cac6c9a999..b503f3ae4654 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-31  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/55134
+	* trans-array.c (gfc_conv_array_parameter): Regard AS_DEFERRED as
+	array with descriptor.
+
 2012-10-28  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/54958
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 3e684ee66495..26f0523d20f8 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -7012,6 +7012,7 @@ gfc_conv_array_parameter (gfc_se * se, gfc_expr * expr, bool g77,
       if (!sym->attr.pointer
 	  && sym->as
 	  && sym->as->type != AS_ASSUMED_SHAPE 
+	  && sym->as->type != AS_DEFERRED
 	  && sym->as->type != AS_ASSUMED_RANK 
 	  && !sym->attr.allocatable)
         {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 10f98bc76c02..7e223e88d006 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/55134
+	* gfortran.dg/associate_11.f90: New.
+
 2012-10-31  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/54955
diff --git a/gcc/testsuite/gfortran.dg/associate_11.f90 b/gcc/testsuite/gfortran.dg/associate_11.f90
new file mode 100644
index 000000000000..182c80b18b10
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/associate_11.f90
@@ -0,0 +1,25 @@
+! { dg-do run }
+! { dg-options "-fdump-tree-original" }
+!
+! PR fortran/55134
+!
+! Contributed by Valery Weber
+!
+program bug
+  implicit none
+  integer,dimension(1)::i
+  i(:)=1
+  associate(a =>i)
+    call foo(a)
+  end associate
+! write(*,*) i
+  if (i(1) /= 2) call abort
+contains
+  subroutine foo(v)
+    integer, dimension(*) :: v
+    v(1)=2
+  end subroutine foo
+end program bug
+
+! { dg-final { scan-tree-dump-times "foo ..integer.kind=4..0:. . restrict. a.data.;" 1 "original" } }
+! { dg-final { cleanup-tree-dump "original" } }