From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 5A699385843D for ; Tue, 13 Sep 2022 11:03:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5A699385843D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=mentor.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.93,312,1654588800"; d="scan'208,223";a="82769466" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 13 Sep 2022 03:03:41 -0800 IronPort-SDR: 64B8hYp5OL9wKGk1QR9kEpjhukduW0TM7He4Y3pABqH/NTHH0UTyz4ogsbZv9Zm4KmS/FPYemW Zl06YXjFlSRih/mbavJmDZPvu7h0AG1+kNObY/P6+MyV4syg1bCKJlg4NdRINWujOxGYf1MHNr OUK/T7DoHxI9Z6M2ndON/HrBSx+hmUACogVxfyCtxqyfu7dUSgcay/YOEuBvuKU823LgePhQNr OpZaPi1E7zh3O1Jw8inYEjGkPRRXeC6+P+DKfeYK2kfSGV5Zq5U7SFDIolpVRU9NePpWWjdloz 6V8= Content-Type: multipart/mixed; boundary="------------60GTJqRyFs5jH0kVPmCR6vDh" Message-ID: <62eb3792-62f6-7ebf-aa41-01d03287b573@mentor.com> Date: Tue, 13 Sep 2022 13:03:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Content-Language: en-US To: From: Paul-Antoine Arras Subject: [OG12][PATCH] openmp: Fix handling of target constructs in static member CC: X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,KAM_SHORT,SPF_HELO_PASS,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: --------------60GTJqRyFs5jH0kVPmCR6vDh Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Hello, This patch intends to backport e90af965e5c by Jakub Jelinek to devel/omp/gcc-12. The original patch was described here: https://gcc.gnu.org/pipermail/gcc-patches/2022-September/601189.html Thanks, -- Paul-Antoine Arras --------------60GTJqRyFs5jH0kVPmCR6vDh Content-Type: text/plain; charset="UTF-8"; name="0001-openmp-Fix-handling-of-target-constructs-in-static-m.patch" Content-Disposition: attachment; filename*0="0001-openmp-Fix-handling-of-target-constructs-in-static-m.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBjMWZiNmZmODk3ZDBiOTI5ODA3ZDUyY2Y1MmQ0ODk0ZTI1MmU3ZDk2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKYWt1YiBKZWxpbmVrIDxqYWt1YkByZWRoYXQuY29t PgpEYXRlOiBXZWQsIDcgU2VwIDIwMjIgMDg6NTQ6MTMgKzAyMDAKU3ViamVjdDogW1BBVENI XSBvcGVubXA6IEZpeCBoYW5kbGluZyBvZiB0YXJnZXQgY29uc3RydWN0cyBpbiBzdGF0aWMg bWVtYmVyCiBmdW5jdGlvbnMgW1BSMTA2ODI5XQoKSnVzdCBjYWxsaW5nIGN1cnJlbnRfbm9u bGFtYmRhX2NsYXNzX3R5cGUgaW4gc3RhdGljIG1lbWJlciBmdW5jdGlvbnMgcmV0dXJucwpu b24tTlVMTCwgYnV0IHNvbWV0aGluZyB0aGF0IGlzbid0ICp0aGlzIGFuZCBpZiB1bmx1Y2t5 IGNhbiBtYXRjaCBwYXJ0IG9mIHRoZQpJTCBhbmQgY2FuIGJlIGFkZGVkIHRvIHRhcmdldCBj bGF1c2VzLgogICAgICBpZiAoREVDTF9OT05TVEFUSUNfTUVNQkVSX1AgKGRlY2wpCiAgICAg ICAgICAmJiBjdXJyZW50X2NsYXNzX3B0cikKaXMgYSBndWFyZCB1c2VkIGVsc2V3aGVyZSAo aW4gY2hlY2tfYWNjZXNzaWJpbGl0eV9vZl9xdWFsaWZpZWRfaWQpLgoKMjAyMi0wOS0wNyAg SmFrdWIgSmVsaW5layAgPGpha3ViQHJlZGhhdC5jb20+CgoJUFIgYysrLzEwNjgyOQoJKiBz ZW1hbnRpY3MuY2MgKGZpbmlzaF9vbXBfdGFyZ2V0X2NsYXVzZXMpOiBJZiBjdXJyZW50X2Z1 bmN0aW9uX2RlY2wKCWlzbid0IGEgbm9uc3RhdGljIG1lbWJlciBmdW5jdGlvbiwgZG9uJ3Qg c2V0IGRhdGEuY3VycmVudF9vYmplY3QgdG8KCW5vbi1OVUxMLgoKCSogZysrLmRnL2dvbXAv cHIxMDY4MjkuQzogTmV3IHRlc3QuCgooY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCBlOTBh Zjk2NWU1Yzg1OGJhMDJjMGNkZmJhYzM1ZDBhMTlkYTFjMmY2KQotLS0KIGdjYy9jcC9DaGFu Z2VMb2cub21wICAgICAgICAgICAgICAgICB8IDEwICsrKysrKysrKysKIGdjYy9jcC9zZW1h bnRpY3MuY2MgICAgICAgICAgICAgICAgICB8IDE3ICsrKysrKysrLS0tLS0tLS0tCiBnY2Mv dGVzdHN1aXRlL0NoYW5nZUxvZy5vbXAgICAgICAgICAgfCAgOCArKysrKysrKwogZ2NjL3Rl c3RzdWl0ZS9nKysuZGcvZ29tcC9wcjEwNjgyOS5DIHwgMTUgKysrKysrKysrKysrKysrCiA0 IGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCiBjcmVh dGUgbW9kZSAxMDA2NDQgZ2NjL3Rlc3RzdWl0ZS9nKysuZGcvZ29tcC9wcjEwNjgyOS5DCgpk aWZmIC0tZ2l0IGdjYy9jcC9DaGFuZ2VMb2cub21wIGdjYy9jcC9DaGFuZ2VMb2cub21wCmlu ZGV4IDM1NTA0ZjRjOTJiLi5jMzIxNGYzMTI1MiAxMDA2NDQKLS0tIGdjYy9jcC9DaGFuZ2VM b2cub21wCisrKyBnY2MvY3AvQ2hhbmdlTG9nLm9tcApAQCAtMSwzICsxLDEzIEBACisyMDIy LTA5LTA5ICBQYXVsLUFudG9pbmUgQXJyYXMgIDxwYUBjb2Rlc291cmNlcnkuY29tPgorCisJ QmFja3BvcnQgZnJvbSBtYWlubGluZToKKwkyMDIyLTA5LTA3ICBKYWt1YiBKZWxpbmVrICA8 amFrdWJAcmVkaGF0LmNvbT4KKworCVBSIGMrKy8xMDY4MjkKKwkqIHNlbWFudGljcy5jYyAo ZmluaXNoX29tcF90YXJnZXRfY2xhdXNlcyk6IElmIGN1cnJlbnRfZnVuY3Rpb25fZGVjbAor CWlzbid0IGEgbm9uc3RhdGljIG1lbWJlciBmdW5jdGlvbiwgZG9uJ3Qgc2V0IGRhdGEuY3Vy cmVudF9vYmplY3QgdG8KKwlub24tTlVMTC4KKwogMjAyMi0wOS0wNyAgVG9iaWFzIEJ1cm51 cyAgPHRvYmlhc0Bjb2Rlc291cmNlcnkuY29tPgogCiAJQmFja3BvcnQgZnJvbSBtYWlubGlu ZToKZGlmZiAtLWdpdCBnY2MvY3Avc2VtYW50aWNzLmNjIGdjYy9jcC9zZW1hbnRpY3MuY2MK aW5kZXggNzcxN2E4MjBmMGQuLmRhZDA0ZGM0NzU3IDEwMDY0NAotLS0gZ2NjL2NwL3NlbWFu dGljcy5jYworKysgZ2NjL2NwL3NlbWFudGljcy5jYwpAQCAtOTcyNywxNiArOTcyNywxNSBA QCBmaW5pc2hfb21wX3RhcmdldF9jbGF1c2VzIChsb2NhdGlvbl90IGxvYywgdHJlZSBib2R5 LCB0cmVlICpjbGF1c2VzX3B0cikKIHsKICAgb21wX3RhcmdldF93YWxrX2RhdGEgZGF0YTsK ICAgZGF0YS50aGlzX2V4cHJfYWNjZXNzZWQgPSBmYWxzZTsKKyAgZGF0YS5jdXJyZW50X29i amVjdCA9IE5VTExfVFJFRTsKIAotICB0cmVlIGN0ID0gY3VycmVudF9ub25sYW1iZGFfY2xh c3NfdHlwZSAoKTsKLSAgaWYgKGN0KQotICAgIHsKLSAgICAgIHRyZWUgb2JqZWN0ID0gbWF5 YmVfZHVtbXlfb2JqZWN0IChjdCwgTlVMTCk7Ci0gICAgICBvYmplY3QgPSBtYXliZV9yZXNv bHZlX2R1bW15IChvYmplY3QsIHRydWUpOwotICAgICAgZGF0YS5jdXJyZW50X29iamVjdCA9 IG9iamVjdDsKLSAgICB9Ci0gIGVsc2UKLSAgICBkYXRhLmN1cnJlbnRfb2JqZWN0ID0gTlVM TF9UUkVFOworICBpZiAoREVDTF9OT05TVEFUSUNfTUVNQkVSX1AgKGN1cnJlbnRfZnVuY3Rp b25fZGVjbCkgJiYgY3VycmVudF9jbGFzc19wdHIpCisgICAgaWYgKHRyZWUgY3QgPSBjdXJy ZW50X25vbmxhbWJkYV9jbGFzc190eXBlICgpKQorICAgICAgeworCXRyZWUgb2JqZWN0ID0g bWF5YmVfZHVtbXlfb2JqZWN0IChjdCwgTlVMTCk7CisJb2JqZWN0ID0gbWF5YmVfcmVzb2x2 ZV9kdW1teSAob2JqZWN0LCB0cnVlKTsKKwlkYXRhLmN1cnJlbnRfb2JqZWN0ID0gb2JqZWN0 OworICAgICAgfQogCiAgIGlmIChERUNMX0xBTUJEQV9GVU5DVElPTl9QIChjdXJyZW50X2Z1 bmN0aW9uX2RlY2wpKQogICAgIHsKZGlmZiAtLWdpdCBnY2MvdGVzdHN1aXRlL0NoYW5nZUxv Zy5vbXAgZ2NjL3Rlc3RzdWl0ZS9DaGFuZ2VMb2cub21wCmluZGV4IGVkNDJiMjBiMDk5Li45 Y2E0ZDkzNmZmNSAxMDA2NDQKLS0tIGdjYy90ZXN0c3VpdGUvQ2hhbmdlTG9nLm9tcAorKysg Z2NjL3Rlc3RzdWl0ZS9DaGFuZ2VMb2cub21wCkBAIC0xLDMgKzEsMTEgQEAKKzIwMjItMDkt MDkgIFBhdWwtQW50b2luZSBBcnJhcyAgPHBhQGNvZGVzb3VyY2VyeS5jb20+CisKKwlCYWNr cG9ydCBmcm9tIG1haW5saW5lOgorCTIwMjItMDktMDcgIEpha3ViIEplbGluZWsgIDxqYWt1 YkByZWRoYXQuY29tPgorCisJUFIgYysrLzEwNjgyOQorCSogZysrLmRnL2dvbXAvcHIxMDY4 MjkuQzogTmV3IHRlc3QuCisKIDIwMjItMDktMDcgIFRvYmlhcyBCdXJudXMgIDx0b2JpYXNA Y29kZXNvdXJjZXJ5LmNvbT4KIAogCUJhY2twb3J0IGZyb20gbWFpbmxpbmU6CmRpZmYgLS1n aXQgZ2NjL3Rlc3RzdWl0ZS9nKysuZGcvZ29tcC9wcjEwNjgyOS5DIGdjYy90ZXN0c3VpdGUv ZysrLmRnL2dvbXAvcHIxMDY4MjkuQwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMC4uMDI5NWVmYjg4ZWUKLS0tIC9kZXYvbnVsbAorKysgZ2NjL3Rlc3RzdWl0ZS9n KysuZGcvZ29tcC9wcjEwNjgyOS5DCkBAIC0wLDAgKzEsMTUgQEAKKy8vIFBSIGMrKy8xMDY4 MjkKKworbmFtZXNwYWNlIHN0ZAoreworICB0ZW1wbGF0ZSA8dHlwZW5hbWU+IGNsYXNzIGNv bXBsZXg7CisgIHRlbXBsYXRlIDw+IHN0cnVjdCBjb21wbGV4PGRvdWJsZT4geyBjb21wbGV4 IChkb3VibGUpOyBfQ29tcGxleCBkb3VibGUgZDsgfTsKK30KK3N0cnVjdCBTIHsgdm9pZCBz dGF0aWMgZm9vICgpOyB9OworCit2b2lkCitTOjpmb28gKCkKK3sKKyNwcmFnbWEgb21wIHRh cmdldAorICBzdGQ6OmNvbXBsZXg8ZG91YmxlPiBjID0gMC4wOworfQotLSAKMi4zMS4xCgo= --------------60GTJqRyFs5jH0kVPmCR6vDh--