re PR fortran/34655 (5.5.2.5)

2008-01-06  Tobias Burnus  <burnus@net-b.de>

        PR fortran/34655
        * resolve.c (resolve_equivalence_derived): Reject derived types
        * with
        default initialization if equivalenced with COMMON variable.

2008-01-06  Tobias Burnus  <burnus@net-b.de>

        PR fortran/34655
        * gfortran.dg/equiv_constraint_9.f90: New.

From-SVN: r131353

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2fccd4862f80ca05ce2f84fbf8143aae27be7222..a3d2ee8fe7174e8595582d1ff4dd8f0914ed11ef 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-06  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/34655
+       * resolve.c (resolve_equivalence_derived): Reject derived types with
+       default initialization if equivalenced with COMMON variable.
+
 2008-01-06  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/34654

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index e4f7dcbac4aad914d56b717b002ad273a4d348c7..6cde79fb75562cf28d6d1a1a305bdc2fa3c12ef4 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -8534,6 +8534,14 @@ resolve_equivalence_derived (gfc_symbol *derived, gfc_symbol *sym, gfc_expr *e)
       return FAILURE;
     }
 
+  if (sym->attr.in_common && has_default_initializer (sym->ts.derived))
+    {
+      gfc_error ("Derived type variable '%s' at %L with default "
+                "initialization cannot be in EQUIVALENCE with a variable "
+                "in COMMON", sym->name, &e->where);
+      return FAILURE;
+    }
+
   for (; c ; c = c->next)
     {
       d = c->ts.derived;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2b08e5793e2ab52380ff6ca2beef31f6f40ca447..549a0074f6b98c7d577d6ad973a08dfa70948371 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-06  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/34655
+       * gfortran.dg/equiv_constraint_9.f90: New.
+
 2008-01-06  Revital Eres  <eres@il.ibm.com>
 
        PR tree-optimization/34263

diff --git a/gcc/testsuite/gfortran.dg/equiv_constraint_9.f90 b/gcc/testsuite/gfortran.dg/equiv_constraint_9.f90
new file mode 100644 (file)
index 0000000..3374441
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/equiv_constraint_9.f90
@@ -0,0 +1,28 @@
+! { dg-do compile }
+!
+! PR fortran/34655
+!
+! Check for F2003's 5.5.2.5 Restrictions on common and equivalence
+! Test case contributed by Joost VandeVondele.
+!
+implicit none
+type data_type
+ sequence
+ integer :: I = 7
+end type data_type
+
+
+type data_type2
+ sequence
+ integer :: I
+end type data_type2
+
+type(data_type) :: dd, ff
+type(data_type2) :: gg
+integer :: j, k, m
+EQUIVALENCE(dd,J) ! { dg-error "with default initializations cannot be in EQUIVALENCE with a variable in COMMON" }
+EQUIVALENCE(ff,k)
+EQUIVALENCE(gg,m)
+COMMON /COM/ j
+COMMON /COM/ m
+END