backport: [multiple changes]

2012-05-02  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline
        2012-04-12  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52864
        * expr.c (gfc_check_vardef_context): Fix assignment check for
        pointer components.

2012-05-02  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline
        2012-04-16  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52864
        * gfortran.dg/pointer_intent_6.f90: New.

From-SVN: r187046

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f78663e6dd1b8130c4f02474a0590de6e1098c4f..b5789984b5fad3c85d26ef92129f8c804f552e35 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-02  Tobias Burnus  <burnus@net-b.de>
+
+       Backport from mainline
+       2012-04-12  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/52864
+       * expr.c (gfc_check_vardef_context): Fix assignment check for
+       pointer components.
+
 2012-03-10  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/52469

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index a4da37c20dcb9037c5880889fe9adebc703c0d06..3330cc89313427a0b004fc10aa46450a6250222c 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -4474,7 +4474,11 @@ gfc_check_vardef_context (gfc_expr* e, bool pointer, const char* context)
       if (ptr_component && ref->type == REF_COMPONENT)
        check_intentin = false;
       if (ref->type == REF_COMPONENT && ref->u.c.component->attr.pointer)
-       ptr_component = true;
+       {
+         ptr_component = true;
+         if (!pointer)
+           check_intentin = false;
+       }
     }
   if (check_intentin && sym->attr.intent == INTENT_IN)
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f599a5424111c5b7adefa1c61ac5773ddafa516a..d7d4295dda63f7a3c17e02a9f6a9d92115099a99 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-02  Tobias Burnus  <burnus@net-b.de>
+
+       Backport from mainline
+       2012-04-16  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/52864
+       * gfortran.dg/pointer_intent_6.f90: New.
+
 2012-04-30  Uros Bizjak  <ubizjak@gmail.com>
 
        Backport from mainline

diff --git a/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 b/gcc/testsuite/gfortran.dg/pointer_intent_6.f90
new file mode 100644 (file)
index 0000000..56c7de5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pointer_intent_6.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+!
+! PR fortran/52864
+!
+! Assigning to an intent(in) pointer (which is valid).
+!
+      program test
+         type PoisFFT_Solver3D
+           complex, dimension(:,:,:), &
+                           pointer :: work => null()
+         end type PoisFFT_Solver3D
+      contains
+        subroutine PoisFFT_Solver3D_FullPeriodic(D, p)
+          type(PoisFFT_Solver3D), intent(in) :: D
+          real, intent(in), pointer :: p(:)
+          D%work(i,j,k) = 0.0
+          p = 0.0
+        end subroutine
+      end