aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorTobias Burnus <burnus@gcc.gnu.org>2012-05-04 20:53:17 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2012-05-04 20:53:17 +0200
commit6ba84c3143a13266f40ea804ae2fb98717ccfc04 (patch)
treea8fd75206e80a78b28a8d7f21a16cbdaa1a6bb2e /gcc/fortran
parentcef31f9c56a00141385da8caa2efb53886747e67 (diff)
downloadgcc-6ba84c3143a13266f40ea804ae2fb98717ccfc04.zip
gcc-6ba84c3143a13266f40ea804ae2fb98717ccfc04.tar.gz
gcc-6ba84c3143a13266f40ea804ae2fb98717ccfc04.tar.bz2
re PR fortran/53111 (Derived types cannot be USE-associated again with -std=f95)
2012-05-04 Tobias Burnus <burnus@net-b.de> PR fortran/53111 * resolve.c (resolve_fl_derived): Fix -std=f95 diagnostic for generic vs. DT names. 2012-05-04 Tobias Burnus <burnus@net-b.de> PR fortran/53111 * gfortran.dg/constructor_7.f90: New. * gfortran.dg/constructor_8.f90: New. From-SVN: r187174
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/resolve.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5662651..0965b00 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-04 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/53111
+ * resolve.c (resolve_fl_derived): Fix -std=f95
+ diagnostic for generic vs. DT names.
+
2012-05-03 Tobias Burnus <burnus@net-b.de>
PR fortran/52864
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 57da577..411ebb5 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12015,6 +12015,8 @@ resolve_fl_derived (gfc_symbol *sym)
if (!sym->attr.is_class)
gfc_find_symbol (sym->name, sym->ns, 0, &gen_dt);
if (gen_dt && gen_dt->generic && gen_dt->generic->next
+ && (!gen_dt->generic->sym->attr.use_assoc
+ || gen_dt->generic->sym->module != gen_dt->generic->next->sym->module)
&& gfc_notify_std (GFC_STD_F2003, "Fortran 2003: Generic name '%s' of "
"function '%s' at %L being the same name as derived "
"type at %L", sym->name,