Is the following patch OK for trunk and 5.3?
I have used the legalese found in my draft for Fortran 2015.
Would it be acceptable to replace
"with the BIND attribute or the SEQUENCE attribute"
with
"with the BIND or SEQUENCE attribute"?
Dominique
Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog (revision 230455)
+++ gcc/fortran/ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2015-11-17 Dominique d'Humieres <domi...@lps.ens.fr>
+
+ PR fortran/65751
+ * expr.c (gfc_check_pointer_assign): Fix error message.
+
2015-11-16 Steven G. Kargl <ka...@gcc.gnu.org>
PR fortran/58027
Index: gcc/fortran/expr.c
===================================================================
--- gcc/fortran/expr.c (revision 230455)
+++ gcc/fortran/expr.c (working copy)
@@ -3632,11 +3632,10 @@
|| (lvalue->ts.type == BT_DERIVED
&& (lvalue->ts.u.derived->attr.is_bind_c
|| lvalue->ts.u.derived->attr.sequence))))
- gfc_error ("Data-pointer-object &L must be unlimited "
- "polymorphic, a sequence derived type or of a "
- "type with the BIND attribute assignment at %L "
- "to be compatible with an unlimited polymorphic "
- "target", &lvalue->where);
+ gfc_error ("Data-pointer-object at %L must be unlimited "
+ "polymorphic, or of a type with the BIND attribute "
+ "or the SEQUENCE attribute, to be compatible with "
+ "an unlimited polymorphic target", &lvalue->where);
else
gfc_error ("Different types in pointer assignment at %L; "
"attempted assignment of %s to %s", &lvalue->where,
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog (revision 230455)
+++ gcc/testsuite/ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2015-11-17 Dominique d'Humieres <domi...@lps.ens.fr>
+
+ PR fortran/65751
+ * gfortran.dg/unlimited_polymorphic_2.f03: Update test.
+
2015-11-17 Uros Bizjak <ubiz...@gmail.com>
* gcc.dg/torture/pr68264.c: Use dg-add-options ieee.
Index: gcc/testsuite/gfortran.dg/unlimited_polymorphic_2.f03
===================================================================
--- gcc/testsuite/gfortran.dg/unlimited_polymorphic_2.f03 (revision
230455)
+++ gcc/testsuite/gfortran.dg/unlimited_polymorphic_2.f03 (working copy)
@@ -48,7 +48,7 @@
call foo (y)
y => tgt ! This is OK, of course.
- tgt => y ! { dg-error "must be unlimited polymorphic" }
+ tgt => y ! { dg-error "Data-pointer-object at .1. must be unlimited
polymorphic" }
select type (y) ! This is the correct way to accomplish the previous
type is (integer)
