From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1991 invoked by alias); 17 Nov 2015 09:53:58 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 1972 invoked by uid 89); 17 Nov 2015 09:53:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.5 required=5.0 tests=AWL,BAYES_20,KAM_ASCII_DIVIDERS,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: nef2.ens.fr Received: from nef2.ens.fr (HELO nef2.ens.fr) (129.199.96.40) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 17 Nov 2015 09:53:56 +0000 Received: from mailhost.lps.ens.fr (tournesol.lps.ens.fr [129.199.120.1]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id tAH9rr0X019803 ; Tue, 17 Nov 2015 10:53:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mailhost.lps.ens.fr (Postfix) with ESMTP id A356F1CF; Tue, 17 Nov 2015 10:53:53 +0100 (CET) Received: from mailhost.lps.ens.fr ([127.0.0.1]) by localhost (tournesol.lps.ens.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F1c0zYJ8Ng1r; Tue, 17 Nov 2015 10:53:53 +0100 (CET) Received: from [192.168.1.14] (log78-1-82-242-47-10.fbx.proxad.net [82.242.47.10]) by mailhost.lps.ens.fr (Postfix) with ESMTPSA id 62CB91CE; Tue, 17 Nov 2015 10:53:53 +0100 (CET) From: =?utf-8?Q?Dominique_d=27Humi=C3=A8res?= Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Subject: [PATCH] PR 65751 Bogus &L in error message Date: Tue, 17 Nov 2015 09:53:00 -0000 Message-Id: Cc: Paul Richard Thomas , Thomas Koenig , gcc-patches To: fortran@gcc.gnu.org Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) X-SW-Source: 2015-11/txt/msg02050.txt.bz2 Is the following patch OK for trunk and 5.3?=20 I have used the legalese found in my draft for Fortran 2015. Would it be acceptable to replace=20 "with the BIND attribute or the SEQUENCE attribute"=20 with "with the BIND or SEQUENCE attribute"? Dominique Index: gcc/fortran/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/fortran/ChangeLog (revision 230455) +++ gcc/fortran/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2015-11-17 Dominique d'Humieres + + PR fortran/65751 + * expr.c (gfc_check_pointer_assign): Fix error message. + 2015-11-16 Steven G. Kargl =20 PR fortran/58027 Index: gcc/fortran/expr.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/fortran/expr.c (revision 230455) +++ gcc/fortran/expr.c (working copy) @@ -3632,11 +3632,10 @@ || (lvalue->ts.type =3D=3D 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/testsuite/ChangeLog (revision 230455) +++ gcc/testsuite/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2015-11-17 Dominique d'Humieres + + PR fortran/65751 + * gfortran.dg/unlimited_polymorphic_2.f03: Update test. + 2015-11-17 Uros Bizjak =20 * gcc.dg/torture/pr68264.c: Use dg-add-options ieee. Index: gcc/testsuite/gfortran.dg/unlimited_polymorphic_2.f03 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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) =20 y =3D> tgt ! This is OK, of course. - tgt =3D> y ! { dg-error "must be unlimited polymorphic" } + tgt =3D> y ! { dg-error "Data-pointer-object at .1. must be unlimited = polymorphic" } =20 select type (y) ! This is the correct way to accomplish the previous type is (integer)