From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id D9AD63858C54 for ; Fri, 1 Jul 2022 20:38:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D9AD63858C54 Received: by mail-pf1-x42f.google.com with SMTP id n12so3523195pfq.0 for ; Fri, 01 Jul 2022 13:38:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=l8TCnpsbgQSWoJcjpEj9jouTR4Wqp4KqET74EZ2eZQg=; b=3/GE8MBYVMk5nf/z2SiRMOde4wSs+0Z5TWZCDY0hLaICWLGBmOKzgQrrrcrssFl4t3 ZJuZjSpq7W3ZL6FMALNFJGGKkR+l5A+cN+ymwHY+JnSjU5w1Pcd/TNi2DOFpb+jCpGNu A4M2Aioh+4Q0lvFK+6+CHZ6MFqaZOJvWKkkbvMwU6P9ddL4/h2H6ekDa537VrBuZmhEs VNfjdCA6y4JbPSCnGU+N0Oe1lmk4S7eklnx+iQgRWtAJi4AkZsZEc7XuW0CZjbZHE0Hw xQV0OLNsWd2UMdMZ6X69Bomw6SadPbzuDSYFQCStSXpYzAHOrlyfqR7D+I5pzcCqIfb9 a9TA== X-Gm-Message-State: AJIora9l1TV02K1fB9onyxNfiCAQNfKS6Uf+E6QgbRnfZfO5YB+kTWY2 PkUS3DbSUb+sIsy1S4Qk2rCzbYQgw6+CMKVEmE8KDjETwGy3Eg== X-Google-Smtp-Source: AGRyM1uev5Qpr+JcEoQXlIFXYU8EugDCzJy8OL0+qDRnBdDtp5yFG/k9qTd+jEZ/B+Ygy+ZRcOCGi79CeuiM+tTPRUI= X-Received: by 2002:a63:8749:0:b0:411:6cb6:e92c with SMTP id i70-20020a638749000000b004116cb6e92cmr13677690pge.20.1656707929130; Fri, 01 Jul 2022 13:38:49 -0700 (PDT) MIME-Version: 1.0 From: Ian Lance Taylor Date: Fri, 1 Jul 2022 13:38:37 -0700 Message-ID: Subject: Go patch committed: Avoid C++20 keyword requires To: gcc-patches , gofrontend-dev Content-Type: multipart/mixed; boundary="0000000000009d386605e2c45fd2" X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, 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 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: Fri, 01 Jul 2022 20:38:52 -0000 --0000000000009d386605e2c45fd2 Content-Type: text/plain; charset="UTF-8" This patch to the Go frontend renames "requires" to "needs" to avoid the C++20 keyword. Bootstrapped on x86_64-pc-linux-gnu. Committed to mainline. Ian --0000000000009d386605e2c45fd2 Content-Type: text/plain; charset="US-ASCII"; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l52x48lr0 OWQ0NDQxODY2NGVjOGMzZTU5MzY1OTAxZTNlYzAyZTQ4OGQ5ZTAxYwpkaWZmIC0tZ2l0IGEvZ2Nj L2dvL2dvZnJvbnRlbmQvTUVSR0UgYi9nY2MvZ28vZ29mcm9udGVuZC9NRVJHRQppbmRleCAwZDQ5 ZTllNzBjNi4uNjVmNjRlMGZiZmIgMTAwNjQ0Ci0tLSBhL2djYy9nby9nb2Zyb250ZW5kL01FUkdF CisrKyBiL2djYy9nby9nb2Zyb250ZW5kL01FUkdFCkBAIC0xLDQgKzEsNCBAQAotNTQ4NzIwYmNh NmJmZjIxZWJjOWFiYTIyMjQ5ZDljZTQ1YmJkOTBjNworYWM0MzhlZGM1MzM1ZjY5Yzk1ZGY5MzQy ZjQzNzEyYWQyZjYxYWQ2NgogCiBUaGUgZmlyc3QgbGluZSBvZiB0aGlzIGZpbGUgaG9sZHMgdGhl IGdpdCByZXZpc2lvbiBudW1iZXIgb2YgdGhlIGxhc3QKIG1lcmdlIGRvbmUgZnJvbSB0aGUgZ29m cm9udGVuZCByZXBvc2l0b3J5LgpkaWZmIC0tZ2l0IGEvZ2NjL2dvL2dvZnJvbnRlbmQvZ29nby5j YyBiL2djYy9nby9nb2Zyb250ZW5kL2dvZ28uY2MKaW5kZXggZTEzZGYwZGEyMmIuLjY3YjkxZmFi NGNhIDEwMDY0NAotLS0gYS9nY2MvZ28vZ29mcm9udGVuZC9nb2dvLmNjCisrKyBiL2djYy9nby9n b2Zyb250ZW5kL2dvZ28uY2MKQEAgLTUzMDIsMTYgKzUzMDIsMTYgQEAgR29nbzo6d3JpdGVfY19o ZWFkZXIoKQogICAgICAgTmFtZWRfb2JqZWN0KiBubyA9IHR5cGVzLmZyb250KCk7CiAgICAgICB0 eXBlcy5wb3BfZnJvbnQoKTsKIAotICAgICAgc3RkOjp2ZWN0b3I8Y29uc3QgTmFtZWRfb2JqZWN0 Kj4gcmVxdWlyZXM7CisgICAgICBzdGQ6OnZlY3Rvcjxjb25zdCBOYW1lZF9vYmplY3QqPiBuZWVk czsKICAgICAgIHN0ZDo6dmVjdG9yPGNvbnN0IE5hbWVkX29iamVjdCo+IGRlY2xhcmU7Ci0gICAg ICBpZiAoIW5vLT50eXBlX3ZhbHVlKCktPnN0cnVjdF90eXBlKCktPmNhbl93cml0ZV90b19jX2hl YWRlcigmcmVxdWlyZXMsCisgICAgICBpZiAoIW5vLT50eXBlX3ZhbHVlKCktPnN0cnVjdF90eXBl KCktPmNhbl93cml0ZV90b19jX2hlYWRlcigmbmVlZHMsCiAJCQkJCQkJCSAgJmRlY2xhcmUpKQog CWNvbnRpbnVlOwogCiAgICAgICBib29sIG9rID0gdHJ1ZTsKICAgICAgIGZvciAoc3RkOjp2ZWN0 b3I8Y29uc3QgTmFtZWRfb2JqZWN0Kj46OmNvbnN0X2l0ZXJhdG9yIHByCi0JICAgICA9IHJlcXVp cmVzLmJlZ2luKCk7Ci0JICAgcHIgIT0gcmVxdWlyZXMuZW5kKCkgJiYgb2s7CisJICAgICA9IG5l ZWRzLmJlZ2luKCk7CisJICAgcHIgIT0gbmVlZHMuZW5kKCkgJiYgb2s7CiAJICAgKytwcikKIAl7 CiAJICBmb3IgKHN0ZDo6bGlzdDxOYW1lZF9vYmplY3QqPjo6Y29uc3RfaXRlcmF0b3IgcHQgPSB0 eXBlcy5iZWdpbigpOwpAQCAtNTM0MiwxMCArNTM0MiwxMCBAQCBHb2dvOjp3cml0ZV9jX2hlYWRl cigpCiAJICBpZiAoKnBkID09IG5vKQogCSAgICBjb250aW51ZTsKIAotCSAgc3RkOjp2ZWN0b3I8 Y29uc3QgTmFtZWRfb2JqZWN0Kj4gZHJlcXVpcmVzOworCSAgc3RkOjp2ZWN0b3I8Y29uc3QgTmFt ZWRfb2JqZWN0Kj4gZG5lZWRzOwogCSAgc3RkOjp2ZWN0b3I8Y29uc3QgTmFtZWRfb2JqZWN0Kj4g ZGRlY2xhcmU7CiAJICBpZiAoISgqcGQpLT50eXBlX3ZhbHVlKCktPnN0cnVjdF90eXBlKCktPgot CSAgICAgIGNhbl93cml0ZV90b19jX2hlYWRlcigmZHJlcXVpcmVzLCAmZGRlY2xhcmUpKQorCSAg ICAgIGNhbl93cml0ZV90b19jX2hlYWRlcigmZG5lZWRzLCAmZGRlY2xhcmUpKQogCSAgICBjb250 aW51ZTsKIAogCSAgYm9vbCBkb25lID0gZmFsc2U7CmRpZmYgLS1naXQgYS9nY2MvZ28vZ29mcm9u dGVuZC90eXBlcy5jYyBiL2djYy9nby9nb2Zyb250ZW5kL3R5cGVzLmNjCmluZGV4IGU4MmJlNjg0 MGFhLi40OTk1MjgzYmI2MCAxMDA2NDQKLS0tIGEvZ2NjL2dvL2dvZnJvbnRlbmQvdHlwZXMuY2MK KysrIGIvZ2NjL2dvL2dvZnJvbnRlbmQvdHlwZXMuY2MKQEAgLTY5NjcsNyArNjk2Nyw3IEBAIFN0 cnVjdF90eXBlOjpkb19pbXBvcnQoSW1wb3J0KiBpbXApCiAKIGJvb2wKIFN0cnVjdF90eXBlOjpj YW5fd3JpdGVfdG9fY19oZWFkZXIoCi0gICAgc3RkOjp2ZWN0b3I8Y29uc3QgTmFtZWRfb2JqZWN0 Kj4qIHJlcXVpcmVzLAorICAgIHN0ZDo6dmVjdG9yPGNvbnN0IE5hbWVkX29iamVjdCo+KiBuZWVk cywKICAgICBzdGQ6OnZlY3Rvcjxjb25zdCBOYW1lZF9vYmplY3QqPiogZGVjbGFyZSkgY29uc3QK IHsKICAgY29uc3QgU3RydWN0X2ZpZWxkX2xpc3QqIGZpZWxkcyA9IHRoaXMtPmZpZWxkc187CkBA IC02OTc4LDcgKzY5NzgsNyBAQCBTdHJ1Y3RfdHlwZTo6Y2FuX3dyaXRlX3RvX2NfaGVhZGVyKAog ICAgICAgIHAgIT0gZmllbGRzLT5lbmQoKTsKICAgICAgICArK3ApCiAgICAgewotICAgICAgaWYg KCF0aGlzLT5jYW5fd3JpdGVfdHlwZV90b19jX2hlYWRlcihwLT50eXBlKCksIHJlcXVpcmVzLCBk ZWNsYXJlKSkKKyAgICAgIGlmICghdGhpcy0+Y2FuX3dyaXRlX3R5cGVfdG9fY19oZWFkZXIocC0+ dHlwZSgpLCBuZWVkcywgZGVjbGFyZSkpCiAJcmV0dXJuIGZhbHNlOwogICAgICAgaWYgKEdvZ286 Om1lc3NhZ2VfbmFtZShwLT5maWVsZF9uYW1lKCkpID09ICJfIikKIAlzaW5rcysrOwpAQCAtNjk5 Myw3ICs2OTkzLDcgQEAgU3RydWN0X3R5cGU6OmNhbl93cml0ZV90b19jX2hlYWRlcigKIGJvb2wK IFN0cnVjdF90eXBlOjpjYW5fd3JpdGVfdHlwZV90b19jX2hlYWRlcigKICAgICBjb25zdCBUeXBl KiB0LAotICAgIHN0ZDo6dmVjdG9yPGNvbnN0IE5hbWVkX29iamVjdCo+KiByZXF1aXJlcywKKyAg ICBzdGQ6OnZlY3Rvcjxjb25zdCBOYW1lZF9vYmplY3QqPiogbmVlZHMsCiAgICAgc3RkOjp2ZWN0 b3I8Y29uc3QgTmFtZWRfb2JqZWN0Kj4qIGRlY2xhcmUpIGNvbnN0CiB7CiAgIHQgPSB0LT5mb3J3 YXJkZWQoKTsKQEAgLTcwMjcsMTMgKzcwMjcsMTMgQEAgU3RydWN0X3R5cGU6OmNhbl93cml0ZV90 eXBlX3RvX2NfaGVhZGVyKAogICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBjYXNlIFRZUEVfU1RS VUNUOgotICAgICAgcmV0dXJuIHQtPnN0cnVjdF90eXBlKCktPmNhbl93cml0ZV90b19jX2hlYWRl cihyZXF1aXJlcywgZGVjbGFyZSk7CisgICAgICByZXR1cm4gdC0+c3RydWN0X3R5cGUoKS0+Y2Fu X3dyaXRlX3RvX2NfaGVhZGVyKG5lZWRzLCBkZWNsYXJlKTsKIAogICAgIGNhc2UgVFlQRV9BUlJB WToKICAgICAgIGlmICh0LT5pc19zbGljZV90eXBlKCkpCiAJcmV0dXJuIHRydWU7CiAgICAgICBy ZXR1cm4gdGhpcy0+Y2FuX3dyaXRlX3R5cGVfdG9fY19oZWFkZXIodC0+YXJyYXlfdHlwZSgpLT5l bGVtZW50X3R5cGUoKSwKLQkJCQkJICAgICAgcmVxdWlyZXMsIGRlY2xhcmUpOworCQkJCQkgICAg ICBuZWVkcywgZGVjbGFyZSk7CiAKICAgICBjYXNlIFRZUEVfTkFNRUQ6CiAgICAgICB7CkBAIC03 MDQ5LDEwICs3MDQ5LDEwIEBAIFN0cnVjdF90eXBlOjpjYW5fd3JpdGVfdHlwZV90b19jX2hlYWRl cigKIAkgICAgLy8gV2Ugd2lsbCBhY2NlcHQgZW1wdHkgc3RydWN0IGZpZWxkcywgYnV0IG5vdCBw cmludCB0aGVtLgogCSAgICBpZiAodC0+c3RydWN0X3R5cGUoKS0+dG90YWxfZmllbGRfY291bnQo KSA9PSAwKQogCSAgICAgIHJldHVybiB0cnVlOwotCSAgICByZXF1aXJlcy0+cHVzaF9iYWNrKG5v KTsKLQkgICAgcmV0dXJuIHQtPnN0cnVjdF90eXBlKCktPmNhbl93cml0ZV90b19jX2hlYWRlcihy ZXF1aXJlcywgZGVjbGFyZSk7CisJICAgIG5lZWRzLT5wdXNoX2JhY2sobm8pOworCSAgICByZXR1 cm4gdC0+c3RydWN0X3R5cGUoKS0+Y2FuX3dyaXRlX3RvX2NfaGVhZGVyKG5lZWRzLCBkZWNsYXJl KTsKIAkgIH0KLQlyZXR1cm4gdGhpcy0+Y2FuX3dyaXRlX3R5cGVfdG9fY19oZWFkZXIodC0+YmFz ZSgpLCByZXF1aXJlcywgZGVjbGFyZSk7CisJcmV0dXJuIHRoaXMtPmNhbl93cml0ZV90eXBlX3Rv X2NfaGVhZGVyKHQtPmJhc2UoKSwgbmVlZHMsIGRlY2xhcmUpOwogICAgICAgfQogCiAgICAgY2Fz ZSBUWVBFX0NBTExfTVVMVElQTEVfUkVTVUxUOgpAQCAtNzE1MCw5ICs3MTUwLDkgQEAgU3RydWN0 X3R5cGU6OndyaXRlX2ZpZWxkX3RvX2NfaGVhZGVyKHN0ZDo6b3N0cmVhbSYgb3MsIGNvbnN0IHN0 ZDo6c3RyaW5nJiBuYW1lLAogCiAgICAgY2FzZSBUWVBFX1BPSU5URVI6CiAgICAgICB7Ci0Jc3Rk Ojp2ZWN0b3I8Y29uc3QgTmFtZWRfb2JqZWN0Kj4gcmVxdWlyZXM7CisJc3RkOjp2ZWN0b3I8Y29u c3QgTmFtZWRfb2JqZWN0Kj4gbmVlZHM7CiAJc3RkOjp2ZWN0b3I8Y29uc3QgTmFtZWRfb2JqZWN0 Kj4gZGVjbGFyZTsKLQlpZiAoIXRoaXMtPmNhbl93cml0ZV90eXBlX3RvX2NfaGVhZGVyKHQtPnBv aW50c190bygpLCAmcmVxdWlyZXMsCisJaWYgKCF0aGlzLT5jYW5fd3JpdGVfdHlwZV90b19jX2hl YWRlcih0LT5wb2ludHNfdG8oKSwgJm5lZWRzLAogCQkJCQkgICAgICAmZGVjbGFyZSkpCiAJICBv cyA8PCAidm9pZCoiOwogCWVsc2UK --0000000000009d386605e2c45fd2--