From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from a6-238.smtp-out.eu-west-1.amazonses.com (a6-238.smtp-out.eu-west-1.amazonses.com [54.240.6.238]) by sourceware.org (Postfix) with ESMTPS id 959CB38323C2 for ; Wed, 5 Jun 2024 09:20:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 959CB38323C2 Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=nasilyan.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=eu-west-1.amazonses.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 959CB38323C2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=54.240.6.238 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717579227; cv=none; b=wIVV5gs3xtwypbzWjlAwalaFqgZM5no0gX/sTzAGNsgXKP9un75vKaIvlJ18SKx6alONgq6pNRij4yGvOMQ2y0bUKv4i57gbXs9krYd5bC2E97izsaraz5ISreZ1IkEs0TWr/FWh7RCSQ4ZH/Htcy3jo6Tg8xRYGZibORDcEkFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717579227; c=relaxed/simple; bh=lgbZD4BQ+HqGkgSwRaFlUKmFJAeT8uOD6+L6qzjVPlQ=; h=DKIM-Signature:DKIM-Signature:Subject:From:To:Date:Mime-Version: Message-ID; b=pGIF4PCopufzvjGlb9Gbtx0imqOKcDcbHElk7cVrVKruY5A9UWy3BDUAj3wQueMU59eHrxn5GhhBQLYRVstUPAB7S541t/QDjfPmYEfplbXgC/95xEFNAW0Zq1PvFsuRANRej0N2qEwoUQInt1FtBfBmEfo4Eke9zqHIyoRop8E= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=xce2voaxvxhmx73p47whqmbxwwvd7qkl; d=nasilyan.com; t=1717579223; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:In-Reply-To:References:Message-Id; bh=lgbZD4BQ+HqGkgSwRaFlUKmFJAeT8uOD6+L6qzjVPlQ=; b=ZMjMi8DQQTOdHt6u+tfg0JrOKusRigB+gz0Y6wKm42XUtS/lFkNQ4Td9VAuWdkAq aRRRLkbOUMVKnXZ+XAXQcdpAiklUpeJhxNQLJNSHI2M9r0nI38sQJ+KqyJ2uxZ0hAQH sZRQWJnBK5znwPefpLoYBnWMaLu5pTXfrYm4EP6Q= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1717579223; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:In-Reply-To:References:Message-Id:Feedback-ID; bh=lgbZD4BQ+HqGkgSwRaFlUKmFJAeT8uOD6+L6qzjVPlQ=; b=DlG6avwf46+IP9y8z8Hx8afEAJcPV7rpJlim1Fx/NutXD2uJwKzfneYIFOl08F4H ItPgNYMMYqkbYFwLhL2Y3GIRt08hPN8KKgU31bX+3FkfX8Kd7Qj7ruKJfBNbu+0YL/s 1PAlc3GP0l+B7Can942NOR4mOGMVjyBKirJWgGrM= Subject: Re: [PATCH] c++: Handle erroneous DECL_LOCAL_DECL_ALIAS in duplicate_decls [PR107575] From: =?UTF-8?Q?Simon_Martin?= To: =?UTF-8?Q?Jakub_Jelinek?= Cc: =?UTF-8?Q?gcc-patches=40gcc=2Egnu=2Eorg?= Date: Wed, 5 Jun 2024 09:20:23 +0000 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_mT2oqOjoT9qQxaj07wKEieOb+o4Oq8ZuSzG7WVGVmKcOrjuH" In-Reply-To: References: <20240605081311.97544-1-simon@nasilyan.com> <0102018fe7759751-88e2bb17-ead4-4cf0-a199-fa6231f73b49-000000@eu-west-1.amazonses.com> X-Mailer: Amazon WorkMail Thread-Index: AQHatyA1aN4LzfXwQlWqUEzN+QssNgAAyqH+AAJYhgM= Thread-Topic: [PATCH] c++: Handle erroneous DECL_LOCAL_DECL_ALIAS in duplicate_decls [PR107575] X-Original-Mailer: MailMate (1.13.2r5673) X-Wm-Sent-Timestamp: 1717579222 Message-ID: <0102018fe7b31120-39abcd9a-dd10-4dd3-9e2c-a2160cfe2ab7-000000@eu-west-1.amazonses.com> Feedback-ID: ::1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2024.06.05-54.240.6.238 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. Your mail reader does not understand MIME message format. --=_mT2oqOjoT9qQxaj07wKEieOb+o4Oq8ZuSzG7WVGVmKcOrjuH Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 5 Jun 2024, at 10:34, Jakub Jelinek wrote: > On Wed, Jun 05, 2024 at 08:13:14AM +0000, Simon Martin wrote: >> --- a/gcc/cp/decl.cc >> +++ b/gcc/cp/decl.cc >> @@ -2792,10 +2792,13 @@ duplicate_decls (tree newdecl, tree olddecl, >> bool hiding, bool was_hidden) >> retrofit_lang_decl (newdecl); >> tree alias = DECL_LOCAL_DECL_ALIAS (newdecl) >> = DECL_LOCAL_DECL_ALIAS (olddecl); >> - DECL_ATTRIBUTES (alias) >> - = (*targetm.merge_decl_attributes) (alias, newdecl); >> - if (TREE_CODE (newdecl) == FUNCTION_DECL) >> - merge_attribute_bits (newdecl, alias); >> + if (alias != error_mark_node) >> + { >> + DECL_ATTRIBUTES (alias) = >> + (*targetm.merge_decl_attributes) (alias, newdecl); > > Formatting nit, = should be on the next line, not at the end of a > line. > See https://gcc.gnu.org/codingconventions.html and > https://gcc.gnu.org/codingconventions.html Indeed, thanks. This is fixed in the attached updated patch. Simon > > Jakub --=_mT2oqOjoT9qQxaj07wKEieOb+o4Oq8ZuSzG7WVGVmKcOrjuH Content-Type: text/plain; name=0001-c-Handle-erroneous-DECL_LOCAL_DECL_ALIAS-in-duplicat.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-c-Handle-erroneous-DECL_LOCAL_DECL_ALIAS-in-duplicat.patch RnJvbSBlNzU2MDJkM2NlOTk4MzA3NzQ5ZTUwMjJkOTg5YjU2NGE2ZDE5NzAzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogU2ltb24gTWFydGluIDxzaW1vbkBuYXNpbHlhbi5j b20+DQpEYXRlOiBUdWUsIDQgSnVuIDIwMjQgMjE6MjA6MjMgKzAyMDANClN1YmplY3Q6IFtQ QVRDSF0gYysrOiBIYW5kbGUgZXJyb25lb3VzIERFQ0xfTE9DQUxfREVDTF9BTElBUyBpbiBk dXBsaWNhdGVfZGVjbHMgW1BSMTA3NTc1XQ0KDQpXZSBjdXJyZW50bHkgSUNFIHVwb24gdGhl IGZvbGxvd2luZyBiZWNhdXNlIHdlIGRvbid0IHByb3Blcmx5IGhhbmRsZSBsb2NhbA0KZnVu Y3Rpb25zIHdpdGggYW4gZXJyb3JfbWFya19ub2RlIGFzIERFQ0xfTE9DQUxfREVDTF9BTElB UyBpbiBkdXBsaWNhdGVfZGVjbHMuDQoNCj09PSBjdXQgaGVyZSA9PT0NCnZvaWQgZiAodm9p ZCkgew0KICB2aXJ0dWFsIGludCBmICh2b2lkKSBjb25zdDsNCiAgdmlydHVhbCBpbnQgZiAo dm9pZCk7DQp9DQo9PT0gY3V0IGhlcmUgPT09DQoNClRoaXMgcGF0Y2ggZml4ZXMgdGhpcyBi eSBjaGVja2luZyBmb3IgZXJyb3JfbWFya19ub2RlLg0KDQpTdWNjZXNzZnVsbHkgdGVzdGVk IG9uIHg4Nl82NC1wYy1saW51eC1nbnUuDQoNCglQUiBjKysvMTA3NTc1DQoNCmdjYy9jcC9D aGFuZ2VMb2c6DQoNCgkqIGRlY2wuY2MgKGR1cGxpY2F0ZV9kZWNscyk6IENoZWNrIGZvciBl cnJvcl9tYXJrX25vZGUNCglERUNMX0xPQ0FMX0RFQ0xfQUxJQVMuDQoNCmdjYy90ZXN0c3Vp dGUvQ2hhbmdlTG9nOg0KDQoJKiBnKysuZGcvcGFyc2UvY3Jhc2g3NC5DOiBOZXcgdGVzdC4N Cg0KLS0tDQogZ2NjL2NwL2RlY2wuY2MgICAgICAgICAgICAgICAgICAgICAgIHwgMTEgKysr KysrKy0tLS0NCiBnY2MvdGVzdHN1aXRlL2crKy5kZy9wYXJzZS9jcmFzaDc0LkMgfCAxMSAr KysrKysrKysrKw0KIDIgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkNCiBjcmVhdGUgbW9kZSAxMDA2NDQgZ2NjL3Rlc3RzdWl0ZS9nKysuZGcvcGFy c2UvY3Jhc2g3NC5DDQoNCmRpZmYgLS1naXQgYS9nY2MvY3AvZGVjbC5jYyBiL2djYy9jcC9k ZWNsLmNjDQppbmRleCBkNDgxZTFlYzA3NC4uMDNkZWIxNDkzYTQgMTAwNjQ0DQotLS0gYS9n Y2MvY3AvZGVjbC5jYw0KKysrIGIvZ2NjL2NwL2RlY2wuY2MNCkBAIC0yNzkyLDEwICsyNzky LDEzIEBAIGR1cGxpY2F0ZV9kZWNscyAodHJlZSBuZXdkZWNsLCB0cmVlIG9sZGRlY2wsIGJv b2wgaGlkaW5nLCBib29sIHdhc19oaWRkZW4pDQogCSAgcmV0cm9maXRfbGFuZ19kZWNsIChu ZXdkZWNsKTsNCiAJICB0cmVlIGFsaWFzID0gREVDTF9MT0NBTF9ERUNMX0FMSUFTIChuZXdk ZWNsKQ0KIAkgICAgPSBERUNMX0xPQ0FMX0RFQ0xfQUxJQVMgKG9sZGRlY2wpOw0KLQkgIERF Q0xfQVRUUklCVVRFUyAoYWxpYXMpDQotCSAgICA9ICgqdGFyZ2V0bS5tZXJnZV9kZWNsX2F0 dHJpYnV0ZXMpIChhbGlhcywgbmV3ZGVjbCk7DQotCSAgaWYgKFRSRUVfQ09ERSAobmV3ZGVj bCkgPT0gRlVOQ1RJT05fREVDTCkNCi0JICAgIG1lcmdlX2F0dHJpYnV0ZV9iaXRzIChuZXdk ZWNsLCBhbGlhcyk7DQorCSAgaWYgKGFsaWFzICE9IGVycm9yX21hcmtfbm9kZSkNCisJICAg IHsNCisJICAgICAgREVDTF9BVFRSSUJVVEVTIChhbGlhcykNCisJCT0gKCp0YXJnZXRtLm1l cmdlX2RlY2xfYXR0cmlidXRlcykgKGFsaWFzLCBuZXdkZWNsKTsNCisJICAgICAgaWYgKFRS RUVfQ09ERSAobmV3ZGVjbCkgPT0gRlVOQ1RJT05fREVDTCkNCisJCW1lcmdlX2F0dHJpYnV0 ZV9iaXRzIChuZXdkZWNsLCBhbGlhcyk7DQorCSAgICB9DQogCX0NCiAgICAgfQ0KIA0KZGlm ZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvZysrLmRnL3BhcnNlL2NyYXNoNzQuQyBiL2djYy90 ZXN0c3VpdGUvZysrLmRnL3BhcnNlL2NyYXNoNzQuQw0KbmV3IGZpbGUgbW9kZSAxMDA2NDQN CmluZGV4IDAwMDAwMDAwMDAwLi5hN2JhNTA5NGJlNg0KLS0tIC9kZXYvbnVsbA0KKysrIGIv Z2NjL3Rlc3RzdWl0ZS9nKysuZGcvcGFyc2UvY3Jhc2g3NC5DDQpAQCAtMCwwICsxLDExIEBA DQorLy8gUFIgYysrLzEwNzU3NQ0KKw0KK3ZvaWQgZiAodm9pZCkgew0KKyAgdmlydHVhbCBp bnQgZiAodm9pZCkgY29uc3Q7IC8vIHsgZGctbGluZSBsaW5lXzQgfQ0KKyAgdmlydHVhbCBp bnQgZiAodm9pZCk7IC8vIHsgZGctbGluZSBsaW5lXzUgfQ0KK30NCisNCisvLyB7IGRnLWVy cm9yICJvdXRzaWRlIGNsYXNzIGRlY2xhcmF0aW9uIiB7fSB7IHRhcmdldCAqLSotKiB9IGxp bmVfNCB9DQorLy8geyBkZy1lcnJvciAiY2Fubm90IGhhdmUgY3YtcXVhbGlmaWVyIiB7fSB7 IHRhcmdldCAqLSotKiB9IGxpbmVfNCB9DQorLy8geyBkZy1lcnJvciAiYW1iaWd1YXRpbmcg bmV3IGRlY2xhcmF0aW9uIG9mIiB7fSB7IHRhcmdldCAqLSotKiB9IGxpbmVfNCB9DQorLy8g eyBkZy1lcnJvciAib3V0c2lkZSBjbGFzcyBkZWNsYXJhdGlvbiIge30geyB0YXJnZXQgKi0q LSogfSBsaW5lXzUgfQ0KLS0gDQoyLjQ0LjANCg0K --=_mT2oqOjoT9qQxaj07wKEieOb+o4Oq8ZuSzG7WVGVmKcOrjuH--