aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorAsher Langton <langton2@llnl.gov>2011-06-02 21:41:12 +0000
committerAsher Langton <langton@gcc.gnu.org>2011-06-02 21:41:12 +0000
commitcde3a7a96908f651a844fd43905a64651d42c5af (patch)
treef9006deff7edb39e13973983e95767c37b35e499 /gcc/fortran
parent11126dc093925fdfebfb0d3f9eff60a75d5e5a23 (diff)
downloadgcc-cde3a7a96908f651a844fd43905a64651d42c5af.zip
gcc-cde3a7a96908f651a844fd43905a64651d42c5af.tar.gz
gcc-cde3a7a96908f651a844fd43905a64651d42c5af.tar.bz2
re PR fortran/49268 (Invalid code generated for assumed-size Cray pointee)
* trans-decl.c (gfc_trans_deferred_vars): Treat assumed-size Cray pointees as AS_EXPLICIT. * gfortran.dg/PR49268.f90: New test. From-SVN: r174584
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/trans-decl.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index fec047e..532a30b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
2011-06-02 Asher Langton <langton2@llnl.gov>
+ PR fortran/49268
+ * trans-decl.c (gfc_trans_deferred_vars): Treat assumed-size Cray
+ pointees as AS_EXPLICIT.
+
+2011-06-02 Asher Langton <langton2@llnl.gov>
+
PR fortran/37039
* decl.c (variable_decl): Merge current_as before copying to cp_as.
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 27eca79..a225915 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -3465,7 +3465,11 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block)
if (sym->attr.dimension || sym->attr.codimension)
{
- switch (sym->as->type)
+ /* Assumed-size Cray pointees need to be treated as AS_EXPLICIT. */
+ array_type tmp = sym->as->type;
+ if (tmp == AS_ASSUMED_SIZE && sym->as->cp_was_assumed)
+ tmp = AS_EXPLICIT;
+ switch (tmp)
{
case AS_EXPLICIT:
if (sym->attr.dummy || sym->attr.result)