From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id 848363858D3C for ; Tue, 12 Sep 2023 08:55:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 848363858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-CSE-ConnectionGUID: fBqH28YiRzqLNXUoJDm28g== X-CSE-MsgGUID: wXeAAIB4QYSKIZhOZ9NgsQ== X-IronPort-AV: E=Sophos;i="6.02,245,1688457600"; d="diff'?scan'208";a="18846201" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 12 Sep 2023 00:55:28 -0800 IronPort-SDR: QTCqRN6FOZH9PDTTTDQNQMuLxss66Iu8H21E7MSYaiEBp55nTvP4UJJm+9kpxnkQG5ewAtYH1A UE6iZbxItNoz4WSGjK1tGMQmXVDdcw/JfBQlcJin4i2pQtjUym9bny6tgl+LqBQD7i/1+/brnf gD40UD/ARgfsVltr5OAc6b3FpTg3kNw+qTDh8HXWf22CYOHpQqhc6VSfZV6j1JPoF362m5ImcM TP1CCwMcQb5XcDwecWb6hFgxZqn8kWqGPHM/2x0OKpKaSD0tt8apVAefHWpgiNJdntMrrRccKs k14= Content-Type: multipart/mixed; boundary="------------mcKx2Xd3CdxMW0Og6EPSyq0Y" Message-ID: Date: Tue, 12 Sep 2023 10:55:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [Patch] OpenMP (C only): omp allocate - extend parsing support, improve diagnostic Content-Language: en-US From: Tobias Burnus To: Jakub Jelinek CC: gcc-patches References: <2b31f97f-22a4-3b47-c0d8-4fb01dea7c1c@codesourcery.com> <75657fba-3de3-067b-541b-448b90af2b04@codesourcery.com> <6083ff90-1bb2-41de-a353-369859a1a69b@codesourcery.com> In-Reply-To: <6083ff90-1bb2-41de-a353-369859a1a69b@codesourcery.com> X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP 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: --------------mcKx2Xd3CdxMW0Og6EPSyq0Y Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable Seems as if I missed a 'git add -u' yesterday evening + missed this when rechecking this morning. Now included as separate patch :-/ Unless there are comments, I intent to commit it very soon. Namely, the actual c-parse.cc update was missing and only the updated tests were included. In particular missing: On 12.09.23 09:04, Tobias Burnus wrote: >>> + error_at (OMP_CLAUSE_LOCATION (nl), >>> + "allocator variable %qD must be declared before >>> %qD", >>> + allocator, var); > ... > ... >> I bet we can't catch everything, but perhaps e.g. doing the first >> diagnostics from within walk_tree might be better. > > Done now. (Or only via the attach patch.) Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --------------mcKx2Xd3CdxMW0Og6EPSyq0Y Content-Type: text/x-patch; charset="UTF-8"; name="fix-omp-allocate-check.diff" Content-Disposition: attachment; filename="fix-omp-allocate-check.diff" Content-Transfer-Encoding: base64 T3Blbk1QIChDIG9ubHkpOiBGb3IgJ29tcCBhbGxvY2F0ZScsIHJlYWxseSB3YWxrIHRyZWUg Zm9yICdhbGxvY3RvcicgY2hlY2sKCldhbGsgZXhwcmVzc2lvbiB0cmVlIG9mIHRoZSAnYWxs b2NhdG9yJyBjbGF1c2Ugb2YgJ29tcCBhbGxvY2F0ZScgdG8KZGV0ZWN0IG1vcmUgY2FzZXMg d2hlcmUgdGhlIGFsbG9jYXRvciBleHByZXNzaW9uIGRlcGVuZHMgb24gY29kZSBiZXR3ZWVu CmEgdmFyaWFibGUgZGVjbGFyYXRpb24gYW5kIGl0cyBhc3NvY2lhdGVkICcjcHJhZ21hIG9t cCBhbGxvY2F0ZScuCgpUaGlzIGNvbW1pdCB3YXMgc3VwcG9zZWQgdG8gYmUgcGFydCBvZgog IHIxNC0zODYzLWczNWY0OThkOGRmYzhlNTc5ZWFiYTJmZjJkMmI5Njc2OWM2MzJmZDU4CiAg T3Blbk1QIChDIG9ubHkpOiBvbXAgYWxsb2NhdGUgLSBleHRlbmQgcGFyc2luZyBzdXBwb3J0 LCBpbXByb3ZlIGRpYWdub3N0aWMKd2hpY2ggYWxzbyBjb250YWlucyB0aGUgYXNzb2NpYXRl ZCB0ZXN0Y2FzZSBjaGFuZ2VzIChvb3BzISkuCgpnY2MvYy9DaGFuZ2VMb2c6CgoJKiBjLXBh cnNlci5jYyAoc3RydWN0IGNfb21wX2xvY190cmVlKTogTmV3LgoJKGNfY2hlY2tfb21wX2Fs bG9jYXRlX2FsbG9jYXRvcl9yKTogTmV3OyBjaGVja2luZyBtb3ZlZCBmcm9tIC4uLgoJKGNf cGFyc2VyX29tcF9hbGxvY2F0ZSk6IC4uLiBoZXJlLiBDYWxsIGl0IHZpYSB3YWxrX3RyZWUu CgogZ2NjL2MvYy1wYXJzZXIuY2MgfCAxMDIgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNjEgaW5zZXJ0 aW9ucygrKSwgNDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ2NjL2MvYy1wYXJzZXIu Y2MgYi9nY2MvYy9jLXBhcnNlci5jYwppbmRleCA2NDNlYzAyNzA2Yi4uYjlhMWI3NWNhNDMg MTAwNjQ0Ci0tLSBhL2djYy9jL2MtcGFyc2VyLmNjCisrKyBiL2djYy9jL2MtcGFyc2VyLmNj CkBAIC0xOTM0Myw2ICsxOTM0Myw2MSBAQCBjX3BhcnNlcl9vYWNjX3dhaXQgKGxvY2F0aW9u X3QgbG9jLCBjX3BhcnNlciAqcGFyc2VyLCBjaGFyICpwX25hbWUpCiAgIHJldHVybiBzdG10 OwogfQogCitzdHJ1Y3QgY19vbXBfbG9jX3RyZWUKK3sKKyAgbG9jYXRpb25fdCBsb2M7Cisg IHRyZWUgdmFyOworfTsKKworLyogQ2hlY2sgd2hldGhlciB0aGUgZXhwcmVzc2lvbiB1c2Vk IGluIHRoZSBhbGxvY2F0b3IgY2xhdXNlIGlzIGRlY2xhcmVkIG9yCisgICBtb2RpZmllZCBi ZXR3ZWVuIHRoZSB2YXJpYWJsZSBkZWNsYXJhdGlvbiBhbmQgaXRzIGFsbG9jYXRlIGRpcmVj dGl2ZS4gICovCitzdGF0aWMgdHJlZQorY19jaGVja19vbXBfYWxsb2NhdGVfYWxsb2NhdG9y X3IgKHRyZWUgKnRwLCBpbnQgKiwgdm9pZCAqZGF0YSkKK3sKKyAgdHJlZSB2YXIgPSAoKHN0 cnVjdCBjX29tcF9sb2NfdHJlZSAqKSBkYXRhKS0+dmFyOworICBsb2NhdGlvbl90IGxvYyA9 ICgoc3RydWN0IGNfb21wX2xvY190cmVlICopIGRhdGEpLT5sb2M7CisgIGlmIChUUkVFX0NP REUgKCp0cCkgPT0gVkFSX0RFQ0wgJiYgY19jaGVja19pbl9jdXJyZW50X3Njb3BlICgqdHAp KQorICAgIHsKKyAgICAgIGlmIChsaW5lbWFwX2xvY2F0aW9uX2JlZm9yZV9wIChsaW5lX3Rh YmxlLCBERUNMX1NPVVJDRV9MT0NBVElPTiAodmFyKSwKKwkJCQkgICAgIERFQ0xfU09VUkNF X0xPQ0FUSU9OICgqdHApKSkKKwl7CisJICBlcnJvcl9hdCAobG9jLCAidmFyaWFibGUgJXFE IHVzZWQgaW4gdGhlICU8YWxsb2NhdG9yJT4gY2xhdXNlIG11c3QgIgorCQkJICJiZSBkZWNs YXJlZCBiZWZvcmUgJXFEIiwgKnRwLCB2YXIpOworCSAgaW5mb3JtIChERUNMX1NPVVJDRV9M T0NBVElPTiAoKnRwKSwgImRlY2xhcmVkIGhlcmUiKTsKKwkgIGluZm9ybSAoREVDTF9TT1VS Q0VfTE9DQVRJT04gKHZhciksCisJCSAgInRvIGJlIGFsbG9jYXRlZCB2YXJpYWJsZSBkZWNs YXJlZCBoZXJlIik7CisJICByZXR1cm4gKnRwOworCX0KKyAgICAgIGVsc2UKKwl7CisJICBn Y2NfYXNzZXJ0IChjdXJfc3RtdF9saXN0CisJCSAgICAgICYmIFRSRUVfQ09ERSAoY3VyX3N0 bXRfbGlzdCkgPT0gU1RBVEVNRU5UX0xJU1QpOworCisJICB0cmVlX3N0bXRfaXRlcmF0b3Ig bCA9IHRzaV9sYXN0IChjdXJfc3RtdF9saXN0KTsKKwkgIHdoaWxlICghdHNpX2VuZF9wIChs KSkKKwkgICAgeworCSAgICAgIGlmIChsaW5lbWFwX2xvY2F0aW9uX2JlZm9yZV9wIChsaW5l X3RhYmxlLCBFWFBSX0xPQ0FUSU9OICgqbCksCisJCQkJCSAgICAgREVDTF9TT1VSQ0VfTE9D QVRJT04gKHZhcikpKQorCQkgIGJyZWFrOworCSAgICAgIGlmIChUUkVFX0NPREUgKCpsKSA9 PSBNT0RJRllfRVhQUgorCQkgICYmIFRSRUVfT1BFUkFORCAoKmwsIDApID09ICp0cCkKKwkJ eworCQkgIGVycm9yX2F0IChsb2MsCisJCQkgICAgInZhcmlhYmxlICVxRCB1c2VkIGluIHRo ZSAlPGFsbG9jYXRvciU+IGNsYXVzZSAiCisJCQkgICAgIm11c3Qgbm90IGJlIG1vZGlmaWVk IGJldHdlZW4gZGVjbGFyYXRpb24gb2YgJXFEICIKKwkJCSAgICAiYW5kIGl0cyAlPGFsbG9j YXRlJT4gZGlyZWN0aXZlIiwgKnRwLCB2YXIpOworCQkgIGluZm9ybSAoRVhQUl9MT0NBVElP TiAoKmwpLCAibW9kaWZpZWQgaGVyZSIpOworCQkgIGluZm9ybSAoREVDTF9TT1VSQ0VfTE9D QVRJT04gKHZhciksCisJCQkgICJ0byBiZSBhbGxvY2F0ZWQgdmFyaWFibGUgZGVjbGFyZWQg aGVyZSIpOworCQkgIHJldHVybiAqdHA7CisJCX0KKwkgICAgICAtLWw7CisJICAgIH0KKwl9 CisgICAgfQorICByZXR1cm4gTlVMTF9UUkVFOworfQorCiAvKiBPcGVuTVAgNS54OgogICAg IyBwcmFnbWEgb21wIGFsbG9jYXRlIChsaXN0KSAgY2xhdXNlcwogCkBAIC0xOTQ2NSw4ICsx OTUyMCw4IEBAIGNfcGFyc2VyX29tcF9hbGxvY2F0ZSAoY19wYXJzZXIgKnBhcnNlcikKIAkg ICAgZXJyb3JfYXQgKGxvYywgIiU8YWxsb2NhdG9yJT4gY2xhdXNlIHJlcXVpcmVkIGZvciAi CiAJCQkgICAic3RhdGljIHZhcmlhYmxlICVxRCIsIHZhcik7CiAJICBlbHNlIGlmIChhbGxv Y2F0b3IKLQkJICAgJiYgKHRyZWVfaW50X2NzdF9zZ24gKGFsbG9jYXRvcikgIT0gMQotCQkg ICAgICAgfHwgdHJlZV90b19zaHdpIChhbGxvY2F0b3IpID4gOCkpCisJCSAgICYmICh3aTo6 dG9fd2lkZXN0IChhbGxvY2F0b3IpIDwgMQorCQkgICAgICAgfHwgd2k6OnRvX3dpZGVzdCAo YWxsb2NhdG9yKSA+IDgpKQogCSAgICAvKiA4ID0gbGFyZ2VzdCBwcmVkZWZpbmVkIG1lbW9y eSBhbGxvY2F0b3IuICovCiAJICAgIGVycm9yX2F0IChhbGxvY2F0b3JfbG9jLAogCQkgICAg ICAiJTxhbGxvY2F0b3IlPiBjbGF1c2UgcmVxdWlyZXMgYSBwcmVkZWZpbmVkIGFsbG9jYXRv ciBhcyAiCkBAIC0xOTQ3Nyw0NiArMTk1MzIsMTEgQEAgY19wYXJzZXJfb21wX2FsbG9jYXRl IChjX3BhcnNlciAqcGFyc2VyKQogCQkgICAgICAiJXFEIG5vdCB5ZXQgc3VwcG9ydGVkIiwg dmFyKTsKIAkgIGNvbnRpbnVlOwogCX0KLSAgICAgIGlmIChhbGxvY2F0b3IKLQkgICYmIFRS RUVfQ09ERSAoYWxsb2NhdG9yKSA9PSBWQVJfREVDTAotCSAgJiYgY19jaGVja19pbl9jdXJy ZW50X3Njb3BlICh2YXIpKQorICAgICAgaWYgKGFsbG9jYXRvcikKIAl7Ci0JICBpZiAobGlu ZW1hcF9sb2NhdGlvbl9iZWZvcmVfcCAobGluZV90YWJsZSwgREVDTF9TT1VSQ0VfTE9DQVRJ T04gKHZhciksCi0JCQkJCSBERUNMX1NPVVJDRV9MT0NBVElPTiAoYWxsb2NhdG9yKSkpCi0J ICAgIHsKLQkgICAgICBlcnJvcl9hdCAoT01QX0NMQVVTRV9MT0NBVElPTiAobmwpLAotCQkJ ImFsbG9jYXRvciB2YXJpYWJsZSAlcUQgbXVzdCBiZSBkZWNsYXJlZCBiZWZvcmUgJXFEIiwK LQkJCWFsbG9jYXRvciwgdmFyKTsKLQkgICAgICBpbmZvcm0gKERFQ0xfU09VUkNFX0xPQ0FU SU9OIChhbGxvY2F0b3IpLAotCQkgICAgICAiYWxsb2NhdG9yIGRlY2xhcmVkIGhlcmUiKTsK LQkgICAgICBpbmZvcm0gKERFQ0xfU09VUkNFX0xPQ0FUSU9OICh2YXIpLCAiZGVjbGFyZWQg aGVyZSIpOwotCSAgICB9Ci0JICBlbHNlCi0JICAgewotCSAgICAgZ2NjX2Fzc2VydCAoY3Vy X3N0bXRfbGlzdAotCQkJICYmIFRSRUVfQ09ERSAoY3VyX3N0bXRfbGlzdCkgPT0gU1RBVEVN RU5UX0xJU1QpOwotCSAgICAgdHJlZV9zdG10X2l0ZXJhdG9yIGwgPSB0c2lfbGFzdCAoY3Vy X3N0bXRfbGlzdCk7Ci0JICAgICB3aGlsZSAoIXRzaV9lbmRfcCAobCkpCi0JICAgICAgIHsK LQkJIGlmIChsaW5lbWFwX2xvY2F0aW9uX2JlZm9yZV9wIChsaW5lX3RhYmxlLCBFWFBSX0xP Q0FUSU9OICgqbCksCi0JCQkJCQlERUNMX1NPVVJDRV9MT0NBVElPTiAodmFyKSkpCi0JCSAg IGJyZWFrOwotCQkgaWYgKFRSRUVfQ09ERSAoKmwpID09IE1PRElGWV9FWFBSCi0JCSAgICAg JiYgVFJFRV9PUEVSQU5EICgqbCwgMCkgPT0gYWxsb2NhdG9yKQotCQkgICB7Ci0JCSAgICAg ZXJyb3JfYXQgKEVYUFJfTE9DQVRJT04gKCpsKSwKLQkJCSAgICAgICAiYWxsb2NhdG9yIHZh cmlhYmxlICVxRCwgdXNlZCBpbiB0aGUgIgotCQkJICAgICAgICIlPGFsbG9jYXRlJT4gZGly ZWN0aXZlIGZvciAlcUQsIG11c3Qgbm90IGJlICIKLQkJCSAgICAgICAibW9kaWZpZWQgYmV0 d2VlbiBkZWNsYXJhdGlvbiBvZiAlcUQgYW5kIGl0cyAiCi0JCQkgICAgICAgIiU8YWxsb2Nh dGUlPiBkaXJlY3RpdmUiLAotCQkJICAgICAgIGFsbG9jYXRvciwgdmFyLCB2YXIpOwotCQkg ICAgIGluZm9ybSAoREVDTF9TT1VSQ0VfTE9DQVRJT04gKHZhciksICJkZWNsYXJlZCBoZXJl Iik7Ci0JCSAgICAgaW5mb3JtIChPTVBfQ0xBVVNFX0xPQ0FUSU9OIChubCksICJ1c2VkIGhl cmUiKTsKLQkJICAgICBicmVhazsKLQkJICB9Ci0JCS0tbDsKLQkgICAgIH0KLQkgICB9CisJ ICBzdHJ1Y3QgY19vbXBfbG9jX3RyZWUgZGF0YQorCSAgICA9IHtFWFBSX0xPQ19PUl9MT0Mg KGFsbG9jYXRvciwgT01QX0NMQVVTRV9MT0NBVElPTiAobmwpKSwgdmFyfTsKKwkgIHdhbGtf dHJlZSAoJmFsbG9jYXRvciwgY19jaGVja19vbXBfYWxsb2NhdGVfYWxsb2NhdG9yX3IsICZk YXRhLCBOVUxMKTsKIAl9CiAgICAgICBERUNMX0FUVFJJQlVURVMgKHZhcikgPSB0cmVlX2Nv bnMgKGdldF9pZGVudGlmaWVyICgib21wIGFsbG9jYXRlIiksCiAJCQkJCSBidWlsZF90cmVl X2xpc3QgKGFsbG9jYXRvciwgYWxpZ25tZW50KSwK --------------mcKx2Xd3CdxMW0Og6EPSyq0Y--