From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 199C83858032 for ; Wed, 19 Jan 2022 04:07:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 199C83858032 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-520-bwb9KfMmNbiZ3H0oYzvT5w-1; Tue, 18 Jan 2022 23:07:44 -0500 X-MC-Unique: bwb9KfMmNbiZ3H0oYzvT5w-1 Received: by mail-qv1-f71.google.com with SMTP id 15-20020ad45baf000000b00415c27a8486so1255031qvq.11 for ; Tue, 18 Jan 2022 20:07:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to; bh=88BN7kdtpItxSvrfFSvB1qPf04BZzCYvajDHJ7N1kv8=; b=F7/zUlVLC/Y2ZszuKHIp5aK31daL9CrhhrKwcf8YxHUn9Kl8kVJvsN6Soj/+NFglY/ M2k4OXLkasfz3tBCvtfSrA62tZOdm8tMbYGTUmaW3g/QuuHgf5Dydov81NJdeloYfdwk 2bIWeF314ZwFXsR0lTZS6bamirg2T25PaB3+j22viByoK/5JrWmJ2BLFK8ruVoKyhnxj HogKYuJJB1KuGga0NnbEdJZzCcZ18/g8DIZlTrj2mSaaX0J30Tsq8dDLs5NUDWz0GNgy dy43NMPgXG3p9BABjaOvUz1Opv8GNh7UxlHNTcTJxuz1EkEdppLyc8yvRoH3i60wyb05 28Rw== X-Gm-Message-State: AOAM532IpGgbAfZqAYgcHMRNP6d7IIPYsBp9g+8DI3uTn6xkmci0tsXF PCP14dmRYgd48Mmlv8HNJGuc2WUXUgZTnEFddMLWALu2iM/geSwKOilEjiRMhidLZknmbNX1FDl IT57+bsPMH5neSMQ/SQ== X-Received: by 2002:a05:622a:1713:: with SMTP id h19mr23457918qtk.464.1642565264428; Tue, 18 Jan 2022 20:07:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzEqM/vNH0wRFVyJExxfhP5j9GYiK/PD8HNtCHTf+Dlcel4+LQ1YwlyUW+WSRnSFItht3UVg== X-Received: by 2002:a05:622a:1713:: with SMTP id h19mr23457908qtk.464.1642565264109; Tue, 18 Jan 2022 20:07:44 -0800 (PST) Received: from [192.168.1.149] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id a19sm1078783qtx.7.2022.01.18.20.07.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Jan 2022 20:07:42 -0800 (PST) Message-ID: <16696f1e-27e6-a3b2-eb83-5abc2e809e5c@redhat.com> Date: Tue, 18 Jan 2022 23:07:41 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [pushed] c++: input_location and lookahead [PR104025] To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org References: <20220118225647.151187-1-jason@redhat.com> <20220118232050.GL2646553@tucnak> From: Jason Merrill In-Reply-To: <20220118232050.GL2646553@tucnak> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="------------SiL0goIOTesSDyWLj9cORrzl" Content-Language: en-US X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2022 04:07:49 -0000 This is a multi-part message in MIME format. --------------SiL0goIOTesSDyWLj9cORrzl Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/18/22 18:20, Jakub Jelinek wrote: > On Tue, Jan 18, 2022 at 05:56:47PM -0500, Jason Merrill wrote: >> Debug information was getting confused because input_location was different >> depending on whether we had looked ahead to see if the next tokens look like >> a template argument list. >> >> I tried resetting input_location in cp_lexer_rollback_tokens itself, but >> that caused regressions, so let's just do it here for now. >> >> Tested x86_64-pc-linux-gnu, applying to trunk. >> >> PR c++/104025 >> >> gcc/cp/ChangeLog: >> >> * parser.cc (saved_token_sentinel::rollback): Call >> cp_lexer_set_source_position. >> (~saved_token_sentinel): Call rollback. >> >> gcc/testsuite/ChangeLog: >> >> * g++.dg/warn/pr104025.C: New test. > > The testcase fails for me with this change. Oops, thanks. Fixed thus: --------------SiL0goIOTesSDyWLj9cORrzl Content-Type: text/x-patch; charset=UTF-8; name="0001-c-fix-PR104025-change.patch" Content-Disposition: attachment; filename="0001-c-fix-PR104025-change.patch" Content-Transfer-Encoding: base64 RnJvbSBiZDBlZjM1MzQ4MTZhMWI4ZmZhZDU0NGQ5ZWQ3MjA2OTBhOTdkN2NjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXNvbiBNZXJyaWxsIDxqYXNvbkByZWRoYXQuY29tPgpEYXRl OiBUdWUsIDE4IEphbiAyMDIyIDIyOjExOjU2IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gYysrOiBm aXggUFIxMDQwMjUgY2hhbmdlClRvOiBnY2MtcGF0Y2hlc0BnY2MuZ251Lm9yZwoKU29tZWhvdyBJ IHB1c2hlZCBteSBlYXJsaWVyIHBhdGNoIHdpdGhvdXQgaXQgYWN0dWFsbHkgZml4aW5nIHRoZSB0 ZXN0OyB3ZQpuZWVkIGlucHV0X2xvY2F0aW9uIHRvIGJlIGZvciB0aGUgbGFzdCBjb25zdW1lZCB0 b2tlbiwgbm90IHRoZSBuZXh0IG9uZS4KCmdjYy9jcC9DaGFuZ2VMb2c6CgoJKiBwYXJzZXIuY2Mg KHNhdmVkX3Rva2VuX3NlbnRpbmVsOjpyb2xsYmFjayk6IFVzZQoJY3BfbGV4ZXJfcHJldmlvdXNf dG9rZW4uCi0tLQogZ2NjL2NwL3BhcnNlci5jYyB8IDMgKystCiAxIGZpbGUgY2hhbmdlZCwgMiBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZ2NjL2NwL3BhcnNlci5j YyBiL2djYy9jcC9wYXJzZXIuY2MKaW5kZXggNjBkOWY3YmI3MjMuLjAwMjc5YzQzNDA0IDEwMDY0 NAotLS0gYS9nY2MvY3AvcGFyc2VyLmNjCisrKyBiL2djYy9jcC9wYXJzZXIuY2MKQEAgLTEzMDgs NyArMTMwOCw4IEBAIHN0cnVjdCBzYXZlZF90b2tlbl9zZW50aW5lbAogICB2b2lkIHJvbGxiYWNr ICgpCiAgIHsKICAgICBjcF9sZXhlcl9yb2xsYmFja190b2tlbnMgKGxleGVyKTsKLSAgICBjcF9s ZXhlcl9zZXRfc291cmNlX3Bvc2l0aW9uIChsZXhlcik7CisgICAgY3BfbGV4ZXJfc2V0X3NvdXJj ZV9wb3NpdGlvbl9mcm9tX3Rva2VuCisgICAgICAoY3BfbGV4ZXJfcHJldmlvdXNfdG9rZW4gKGxl eGVyKSk7CiAgICAgbW9kZSA9IFNUU19ET05PVEhJTkc7CiAgIH0KICAgfnNhdmVkX3Rva2VuX3Nl bnRpbmVsICgpCi0tIAoyLjI3LjAKCg== --------------SiL0goIOTesSDyWLj9cORrzl--