re PR fortran/65751 (Bogus &L in error message)

2015-11-17  Dominique d'Humieres <dominiq@lps.ens.fr>

	PR fortran/65751
	* expr.c (gfc_check_pointer_assign): Fix error message.

	* gfortran.dg/unlimited_polymorphic_2.f03: Update test.

From-SVN: r230465

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9923fd4b467fcd07a37547cea1a79faa9aa9312d..e8e601ccac3385927005a468f3ac8973aed976bf 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-17  Dominique d'Humieres <dominiq@lps.ens.fr>
+
+       PR fortran/65751
+       * expr.c (gfc_check_pointer_assign): Fix error message.
+
 2015-11-16  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/58027

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 28ea61a2330f46a346c868b4c213cb0547453c61..7aaf0e252a0224da874214a1b03ddc39b4e27e9f 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -3632,11 +3632,10 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue)
               || (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 or 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,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b8bb337b4d1765034406583a5ce74e02c6dcc062..850758b45d6c7f2ccf940b4c06d02f09df2facab 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-17  Dominique d'Humieres <dominiq@lps.ens.fr>
+
+       PR fortran/65751
+       * gfortran.dg/unlimited_polymorphic_2.f03: Update test.
+
 2015-11-17  Ilya Enkovich  <enkovich.gnu@gmail.com>
 
        PR middle-end/68134

diff --git a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_2.f03 b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_2.f03
index 5eea79dec774c8af70f9a60d1f54a2f56fb581c5..13d7f8e466a548ad063264bbc801f5d9378e2fe9 100644 (file)
--- a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_2.f03
+++ b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_2.f03
@@ -48,7 +48,7 @@ contains
     call foo (y)\r
 \r
     y => tgt ! This is OK, of course.\r
-    tgt => y ! { dg-error "must be unlimited polymorphic" }\r
+    tgt => y ! { dg-error "Data-pointer-object at .1. must be unlimited polymorphic" }\r
 \r
     select type (y) ! This is the correct way to accomplish the previous\r
       type is (integer)\r