re PR fortran/41978 ([F03] ICE in gfc_conv_expr_descriptor for array PPC assignment)

2009-11-11  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/41978
	* resolve.c (resolve_ref): Take care of procedure pointer component
	references.

2009-11-11  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/41978
	* gfortran.dg/proc_ptr_comp_22.f90: New test.

From-SVN: r154107

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a759edb..7038bc3 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-11  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/41978
+       * resolve.c (resolve_ref): Take care of procedure pointer component
+       references.
+
 2009-11-06  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR fortran/41909

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index d9a53e2..f3fce1b 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -4275,7 +4275,9 @@ resolve_ref (gfc_expr *expr)
        case REF_COMPONENT:
          if (current_part_dimension || seen_part_dimension)
            {
-             if (ref->u.c.component->attr.pointer)
+             /* F03:C614.  */
+             if (ref->u.c.component->attr.pointer
+                 || ref->u.c.component->attr.proc_pointer)
                {
                  gfc_error ("Component to the right of a part reference "
                             "with nonzero rank must not have the POINTER "

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c0a802e..95fa342 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-11  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/41978
+       * gfortran.dg/proc_ptr_comp_22.f90: New test.
+
 2009-11-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR testsuite/42001

diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_comp_22.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_comp_22.f90
new file mode 100644 (file)
index 0000000..b82564f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_comp_22.f90
@@ -0,0 +1,31 @@
+! { dg-do compile }
+!
+! PR 41978: [F03] ICE in gfc_conv_expr_descriptor for array PPC assignment
+!
+! Contributed by Daniel Kraft <domob@gcc.gnu.org>
+
+MODULE m
+  IMPLICIT NONE
+
+  TYPE t
+    PROCEDURE(myproc), POINTER, PASS :: myproc
+  END TYPE t
+
+CONTAINS
+
+  INTEGER FUNCTION myproc (me)
+    CLASS(t), INTENT(IN) :: me
+    myproc = 42
+  END FUNCTION myproc
+
+END MODULE m
+
+PROGRAM main
+  USE m
+  IMPLICIT NONE
+
+  TYPE(t) :: arr(2)
+  arr%myproc => myproc  ! { dg-error "must not have the POINTER attribute" }
+END PROGRAM main
+ 
+! { dg-final { cleanup-modules "m" } }