2006-05-30 Asher Langton <langton2@llnl.gov>

	* symbol.c (check_conflict): Allow external, function, and
	subroutine attributes with Cray pointees.
	* trans-expr.c (gfc_conv_function_val): Translate Cray pointees
	that point to procedures.
	* gfortran.texi: Document new feature.

	* gfortran.dg/cray_pointers_7.f90: New test.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 701f236..59da690 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-30  Asher Langton  <langton2@llnl.gov>
+
+       * symbol.c (check_conflict): Allow external, function, and
+       subroutine attributes with Cray pointees.
+       * trans-expr.c (gfc_conv_function_val): Translate Cray pointees
+       that point to procedures.
+       * gfortran.texi: Document new feature.
+
 2006-05-29  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR fortran/27634

diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi
index bfafbfc..260e76f 100644 (file)
--- a/gcc/fortran/gfortran.texi
+++ b/gcc/fortran/gfortran.texi
@@ -1107,13 +1107,28 @@ pointers will ``incorrectly'' optimize code with illegal aliasing.)
 
 There are a number of restrictions on the attributes that can be
 applied to Cray pointers and pointees.  Pointees may not have the
-attributes ALLOCATABLE, INTENT, OPTIONAL, DUMMY, TARGET, EXTERNAL,
+attributes ALLOCATABLE, INTENT, OPTIONAL, DUMMY, TARGET,
 INTRINSIC, or POINTER.  Pointers may not have the attributes
 DIMENSION, POINTER, TARGET, ALLOCATABLE, EXTERNAL, or INTRINSIC.
 Pointees may not occur in more than one pointer statement.  A pointee
 cannot be a pointer.  Pointees cannot occur in equivalence, common, or
 data statements.
 
+A Cray pointer may point to a function or a subroutine.  For example,
+the following excerpt is valid:
+@smallexample
+  implicit none
+  external sub
+  pointer (subptr,subpte)
+  external subpte
+  subptr = loc(sub)
+  call subpte()
+  [...]
+  subroutine sub
+  [...]
+  end subroutine sub
+@end smallexample
+
 A pointer may be modified during the course of a program, and this
 will change the location to which the pointee refers.  However, when
 pointees are passed as arguments, they are treated as ordinary

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index bd7ad1c..7acef42 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -385,11 +385,8 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where)
   conf (cray_pointee, optional);
   conf (cray_pointee, dummy);
   conf (cray_pointee, target);
-  conf (cray_pointee, external);
   conf (cray_pointee, intrinsic);
   conf (cray_pointee, pointer);
-  conf (cray_pointee, function);
-  conf (cray_pointee, subroutine);
   conf (cray_pointee, entry);
   conf (cray_pointee, in_common);
   conf (cray_pointee, in_equivalence);

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index b91ebf6..752609c 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -1191,6 +1191,9 @@ gfc_conv_function_val (gfc_se * se, gfc_symbol * sym)
        sym->backend_decl = gfc_get_extern_function_decl (sym);
 
       tmp = sym->backend_decl;
+      if (sym->attr.cray_pointee)
+       tmp = convert (build_pointer_type (TREE_TYPE (tmp)),
+                      gfc_get_symbol_decl (sym->cp_pointer));
       if (!POINTER_TYPE_P (TREE_TYPE (tmp)))
        {
          gcc_assert (TREE_CODE (tmp) == FUNCTION_DECL);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3738afa..3b8f323 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-30  Asher Langton  <langton2@llnl.gov>
+
+       * gfortran.dg/cray_pointers_7.f90: New test.
+
 2006-05-30  Roger Sayle  <roger@eyesopen.com>
 
        PR tree-optimization/23452

diff --git a/gcc/testsuite/gfortran.dg/cray_pointers_7.f90 b/gcc/testsuite/gfortran.dg/cray_pointers_7.f90
new file mode 100644 (file)
index 0000000..1fe52c0
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/cray_pointers_7.f90
@@ -0,0 +1,43 @@
+! { dg-do run }
+! { dg-options "-fcray-pointer" }
+
+! Test the implementation of Cray pointers to procedures.
+program cray_pointers_7
+  implicit none
+  integer tmp
+  integer, external :: fn
+  external sub
+  
+  ! We can't mix function and subroutine pointers.
+  pointer (subptr,subpte)
+  pointer (fnptr,fnpte)
+  
+  ! Declare pointee types.
+  external subpte
+  integer, external :: fnpte
+  
+  tmp = 0
+  
+  ! Check pointers to subroutines.
+  subptr = loc(sub)
+  call subpte(tmp)
+  if (tmp .ne. 17) call abort()
+
+  ! Check pointers to functions.
+  fnptr = loc(fn)
+  tmp = fnpte(7)
+  if (tmp .ne. 14) call abort()
+  
+end program cray_pointers_7
+
+! Trivial subroutine to be called through a Cray pointer.
+subroutine sub(i)
+  integer i
+  i = 17
+end subroutine sub
+
+! Trivial function to be called through a Cray pointer.
+function fn(i)
+  integer fn,i
+  fn = 2*i
+end function fn