2010-03-17 Tobias Burnus <burnus@net-b.de>

        PR fortran/43331
        * trans-array.c (gfc_conv_array_index_offset,gfc_conv_array_ref,
        gfc_conv_ss_startstride): Remove no-longer-needed cp_was_assumed
        check.
        * decl.c (gfc_match_derived_decl): Don't mark assumed-size Cray
        pointees as having explizit size.
        * expr.c (gfc_check_assign): Remove now unreachable Cray pointee
        check.
        * trans-types.c (gfc_is_nodesc_array): Add cp_was_assumed to
        * assert.
        (gfc_sym_type): Don't mark Cray pointees as restricted pointers.
        * resolve.c (resolve_symbol): Handle cp_was_assumed.
        * trans-decl.c (gfc_trans_deferred_vars): Ditto.
        (gfc_finish_var_decl): Don't mark Cray pointees as restricted
        pointers.

2010-03-17  Tobias Burnus  <burnus@net-b.de>

        PR fortran/43331
        * gfortran.dg/cray_pointers_1.f90: Update dg-error message.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index dd809d9..e445a6a 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-17  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/43331
+       * trans-array.c (gfc_conv_array_index_offset,gfc_conv_array_ref,
+       gfc_conv_ss_startstride): Remove no-longer-needed cp_was_assumed
+       check.
+       * decl.c (gfc_match_derived_decl): Don't mark assumed-size Cray
+       pointees as having explizit size.
+       * expr.c (gfc_check_assign): Remove now unreachable Cray pointee
+       check.
+       * trans-types.c (gfc_is_nodesc_array): Add cp_was_assumed to assert.
+       (gfc_sym_type): Don't mark Cray pointees as restricted pointers.
+       * resolve.c (resolve_symbol): Handle cp_was_assumed.
+       * trans-decl.c (gfc_trans_deferred_vars): Ditto.
+       (gfc_finish_var_decl): Don't mark Cray pointees as restricted
+       pointers.
+

 2010-03-14  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/43362
 2010-03-14  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/43362

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 774dfe4..de316da 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -11010,7 +11010,7 @@ resolve_symbol (gfc_symbol *sym)
      arguments.  */
 
   if (sym->as != NULL
      arguments.  */
 
   if (sym->as != NULL

-      && (sym->as->type == AS_ASSUMED_SIZE
+      && ((sym->as->type == AS_ASSUMED_SIZE && !sym->as->cp_was_assumed)

          || sym->as->type == AS_ASSUMED_SHAPE)
       && sym->attr.dummy == 0)
     {
          || sym->as->type == AS_ASSUMED_SHAPE)
       && sym->attr.dummy == 0)
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bd89299..bd2b05e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-17  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/43331
+       * gfortran.dg/cray_pointers_1.f90: Update dg-error message.
+

 2010-03-16  Uros Bizjak  <ubizjak@gmail.com>
 
        * gcc.dg/graphite/block-3.c: Add dg-timeout-factor.
 2010-03-16  Uros Bizjak  <ubizjak@gmail.com>
 
        * gcc.dg/graphite/block-3.c: Add dg-timeout-factor.