From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 49021 invoked by alias); 12 Nov 2015 13:14:38 -0000 Mailing-List: contact fortran-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: fortran-owner@gcc.gnu.org Received: (qmail 44811 invoked by uid 89); 12 Nov 2015 13:14:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-ob0-f180.google.com Received: from mail-ob0-f180.google.com (HELO mail-ob0-f180.google.com) (209.85.214.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 12 Nov 2015 13:14:35 +0000 Received: by obbnk6 with SMTP id nk6so45767563obb.2 for ; Thu, 12 Nov 2015 05:14:33 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.60.92.234 with SMTP id cp10mr8555159oeb.43.1447334073047; Thu, 12 Nov 2015 05:14:33 -0800 (PST) Received: by 10.202.83.141 with HTTP; Thu, 12 Nov 2015 05:14:32 -0800 (PST) In-Reply-To: <7D748E43-39F5-49DC-BD80-C2A1301165EE@lps.ens.fr> References: <20151109144654.GA44618@troutmask.apl.washington.edu> <7D748E43-39F5-49DC-BD80-C2A1301165EE@lps.ens.fr> Date: Thu, 12 Nov 2015 13:14:00 -0000 Message-ID: Subject: Re: [Patch, fortran] Bug 68241 - [meta-bug] Deferred-length character - PRs50221, 68216 and 67674 From: Paul Richard Thomas To: =?UTF-8?Q?Dominique_d=27Humi=C3=A8res?= Cc: Steve Kargl , "fortran@gcc.gnu.org" , Damian Rouson , Louis Krupp Content-Type: multipart/mixed; boundary=047d7b33d2de4c6947052457b996 X-IsSubscribed: yes X-SW-Source: 2015-11/txt/msg00060.txt.bz2 --047d7b33d2de4c6947052457b996 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-length: 2250 Hi Dominique, Are you sure about pr50221 #4? It runs fine for me. I have attached the testcases for PRs 50221#4, 63932, and 66408. I propose to add these to the commit, once I get approval..... I have a further patch for pr49954, which nearly fixes the testcase in the PR but is not quite there. However, concatenation is in general fixed, when there is no dependency. When there is, the lhs string lengt gets updated before the concatenation, thereby shifting the op2 part of the concatenation. It'll be another few days.... Cheers Paul On 10 November 2015 at 16:39, Dominique d'Humi=C3=A8res wrote: > Dear Paul, > > The patch for gcc/fortran/trans-types.c does not apply on revision r23007= 1 and I had to use > > --- ../_clean/gcc/fortran/trans-types.c 2015-11-08 18:04:13.000000000 +01= 00 > +++ gcc/fortran/trans-types.c 2015-11-10 11:57:33.000000000 +0100 > @@ -1455,7 +1455,13 @@ gfc_get_dtype_rank_type (int rank, tree > } > > gcc_assert (rank <=3D GFC_DTYPE_RANK_MASK); > - size =3D TYPE_SIZE_UNIT (etype); > + > + if (TREE_CODE (etype) =3D=3D ARRAY_TYPE > + && TYPE_MAXVAL (TYPE_DOMAIN (etype)) !=3D NULL_TREE > + && TREE_CODE (TYPE_MAXVAL (TYPE_DOMAIN (etype))) =3D=3D VAR_DECL) > + size =3D TYPE_MAXVAL (TYPE_DOMAIN (etype)); > + else > + size =3D TYPE_SIZE_UNIT (etype); > > i =3D rank | (n << GFC_DTYPE_TYPE_SHIFT); > if (size && INTEGER_CST_P (size)) > > which I hope is correct. > > With the patch (and a few others!-) I have regstrapped without any regres= sion. The tests in pr50221 are fixed except the one in comment 4, the outpu= t is > 4 4 > A > CDV > ? > > > I have also found that pr63932 and pr66408 are fixed by the patch. > > Thanks for your work on this issue, > > Dominique > >> Le 10 nov. 2015 =C3=A0 10:48, Paul Richard Thomas a =C3=A9crit : >> >> Dear Steve, >> >> I was charging around like a mad thing yesterday and sent the >> submission in something of a hurry. Thanks for pointing out the >> omission so quickly. >> >> Please find the patch attached. >> >> Cheers >> >> Paul >> > --=20 Outside of a dog, a book is a man's best friend. Inside of a dog it's too dark to read. Groucho Marx --047d7b33d2de4c6947052457b996 Content-Type: text/x-fortran; charset=US-ASCII; name="deferred_character_4.f90" Content-Disposition: attachment; filename="deferred_character_4.f90" Content-Transfer-Encoding: base64 X-Attachment-Id: f_igw9bjp70 Content-length: 1058 ISB7IGRnLWRvIHJ1biB9CiEKISBDaGVjayB0aGF0IFBSNTAyMjEgY29tbWVu dCAjNCBpcyBmaXhlZC4KIQohIENvbnRyaWJ1dGVkIGJ5IEFyamVuIE1ha3Vz ICA8YXJqZW4ubWFya3VzODk1QGdtYWlsLmNvbT4KIQpwcm9ncmFtIGNoa19h bGxvY19zdHJpbmcKICAgIGltcGxpY2l0IG5vbmUKCiAgICBjaGFyYWN0ZXIo bGVuPTopLCBkaW1lbnNpb24oOiksIGFsbG9jYXRhYmxlIDo6IHN0cmluZ3MK ICAgIGludGVnZXIgOjogaQoKICAgIGFsbG9jYXRlKCBjaGFyYWN0ZXIoMTAp Ojogc3RyaW5ncygxOjMpICkKCiAgICBzdHJpbmdzID0gWyAiQSAgICIsICJD ICAgIiwgIkFCQ0QiLCAiViAgICIgXQoKICAgIGlmIChsZW4oc3RyaW5ncykg Lm5lLiA0KSBjYWxsIGFib3J0CiAgICBpZiAoc2l6ZShzdHJpbmdzLCAxKSAu bmUuIDQpIGNhbGwgYWJvcnQKICAgIGlmIChhbnkgKHN0cmluZ3MgLm5lLiBb Y2hhcmFjdGVyKGxlbj00KSA6OiAiQSIsICJDIiwgIkFCQ0QiLCAiViJdKSkg Y2FsbCBhYm9ydAoKICAgIHN0cmluZ3MgPSBbY2hhcmFjdGVyKGxlbj00KSA6 OiAiQSIsICJDIiwgIkFCQ0RFIiwgIlYiLCAienp6eiJdCgogICAgaWYgKGxl bihzdHJpbmdzKSAubmUuIDQpIGNhbGwgYWJvcnQKICAgIGlmIChzaXplKHN0 cmluZ3MsIDEpIC5uZS4gNSkgY2FsbCBhYm9ydAogICAgaWYgKGFueSAoc3Ry aW5ncyAubmUuIFtjaGFyYWN0ZXIobGVuPTQpIDo6ICJBIiwgIkMiLCAiQUJD RCIsICJWIiwgInp6enoiXSkpIGNhbGwgYWJvcnQKZW5kIHByb2dyYW0gY2hr X2FsbG9jX3N0cmluZwo= --047d7b33d2de4c6947052457b996 Content-Type: text/x-fortran; charset=US-ASCII; name="deferred_character_5.f90" Content-Disposition: attachment; filename="deferred_character_5.f90" Content-Transfer-Encoding: base64 X-Attachment-Id: f_igw9bo771 Content-length: 883 ISB7IGRnLWRvIHJ1biB9CiEKISBUZXN0cyB0aGF0IFBSNjM5MzIgc3RheXMg Zml4ZWQuCiEKISBDb250cmlidXRlZCBieSBWYWxlcnkgV2ViZXIgIDx2YWxl cnl3ZWJlckBob3RtYWlsLmNvbT4KIQptb2R1bGUgbW9kCiAgdHlwZSA6OiB0 CiAgICAgY2hhcmFjdGVyKDopLCBhbGxvY2F0YWJsZSA6OiBjCiAgICAgaW50 ZWdlciA6OiBpCiAgIGNvbnRhaW5zCiAgICAgcHJvY2VkdXJlLCBwYXNzIDo6 IGdldAogIGVuZCB0eXBlIHQKICB0eXBlIDo6IHUKICAgICBjaGFyYWN0ZXIo OiksIGFsbG9jYXRhYmxlIDo6IGMKICBlbmQgdHlwZSB1CmNvbnRhaW5zCiAg c3Vicm91dGluZSBnZXQodGhpcywgYSkKICAgIGNsYXNzKHQpLCBpbnRlbnQo aW4pIDo6IHRoaXMKICAgIGNoYXJhY3Rlcig6KSwgYWxsb2NhdGFibGUsIGlu dGVudChvdXQpLCBvcHRpb25hbCA6OiBhCiAgICBpZiAocHJlc2VudCAoYSkp IGEgPSB0aGlzJWMKICBlbmQgc3Vicm91dGluZSBnZXQKZW5kIG1vZHVsZSBt b2QKCnByb2dyYW0gdGVzdAogIHVzZSBtb2QKICB0eXBlKHQpIDo6IGEKICB0 eXBlKHUpIDo6IGIKICBhJWMgPSAnc29tZXRoaW5nJwogIGNhbGwgYSVnZXQg KGEgPSBiJWMpCiAgaWYgKGIlYyAubmUuICdzb21ldGhpbmcnKSBjYWxsIGFi b3J0CmVuZCBwcm9ncmFtIHRlc3QK --047d7b33d2de4c6947052457b996 Content-Type: text/x-fortran; charset=US-ASCII; name="deferred_character_6.f90" Content-Disposition: attachment; filename="deferred_character_6.f90" Content-Transfer-Encoding: base64 X-Attachment-Id: f_igw9bvdl2 Content-length: 1542 ISB7IGRnLWRvIHJ1biB9CiEKISBUZXN0cyB0aGF0IFBSNjY0MDggc3RheXMg Zml4ZWQuCiEKISBDb250cmlidXRlZCBieSA8d2VybmVyLmJsb2tidXN0ZXJA Z21haWwuY29tPgohCm1vZHVsZSBteXRlc3QKCiAgICBpbXBsaWNpdCBub25l CgogICAgdHlwZSB2YXJ5CiAgICAgICAgY2hhcmFjdGVyKDopLCBhbGxvY2F0 YWJsZSA6OiBzdHJpbmcKICAgIGVuZCB0eXBlIHZhcnkKCiAgICBpbnRlcmZh Y2UgYXNzaWdubWVudCg9KQogICAgICAgIG1vZHVsZSBwcm9jZWR1cmUgY2hh cl9lcV92YXJ5CiAgICBlbmQgaW50ZXJmYWNlIGFzc2lnbm1lbnQoPSkKCmNv bnRhaW5zCgogICAgc3Vicm91dGluZSBjaGFyX2VxX3ZhcnkobXlfY2hhcixt eV92YXJ5KQogICAgICAgIGNoYXJhY3Rlcig6KSwgYWxsb2NhdGFibGUsIGlu dGVudChvdXQpIDo6IG15X2NoYXIKICAgICAgICB0eXBlKHZhcnkpLCBpbnRl bnQoaW4pIDo6IG15X3ZhcnkKICAgICAgICBteV9jaGFyID0gbXlfdmFyeSVz dHJpbmcKICAgIGVuZCBzdWJyb3V0aW5lIGNoYXJfZXFfdmFyeQoKZW5kIG1v ZHVsZSBteXRlc3QKCgpwcm9ncmFtIHRoaXN0ZXN0CgogICAgdXNlIG15dGVz dCwgb25seTogdmFyeSwgYXNzaWdubWVudCg9KQogICAgaW1wbGljaXQgbm9u ZQoKICAgIGNoYXJhY3Rlcig6KSwgYWxsb2NhdGFibGUgOjogdGVzdF9jaGFy CiAgICBjaGFyYWN0ZXIoMTQpLCBwYXJhbWV0ZXIgOjogc3RyID0gJ2V4YW1w bGUgc3RyaW5nJwogICAgdHlwZSh2YXJ5KSA6OiB0ZXN0X3ZhcnkKICAgIHR5 cGUodmFyeSkgOjogbXlfc3R1ZmYKCgogICAgdGVzdF92YXJ5JXN0cmluZyA9 IHN0cgogICAgaWYgKHRlc3RfdmFyeSVzdHJpbmcgLm5lLiBzdHIpIGNhbGwg YWJvcnQKCiEgVGhpcyBwcmV2aW91c2x5IGdhdmUgYSBibGFuayBzdHJpbmcu CiAgICBteV9zdHVmZiVzdHJpbmcgPSB0ZXN0X3ZhcnkKICAgIGlmIChteV9z dHVmZiVzdHJpbmcgLm5lLiBzdHIpIGNhbGwgYWJvcnQKCiAgICB0ZXN0X2No YXIgPSB0ZXN0X3ZhcnkKICAgIGlmICh0ZXN0X2NoYXIgLm5lLiBzdHIpIGNh bGwgYWJvcnQKCiAgICBteV9zdHVmZiA9IHRlc3RfdmFyeQogICAgaWYgKG15 X3N0dWZmJXN0cmluZyAubmUuIHN0cikgY2FsbCBhYm9ydAoKZW5kIHByb2dy YW0gdGhpc3Rlc3QK --047d7b33d2de4c6947052457b996--