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 8AE313858C52; Wed, 21 Sep 2022 21:18:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8AE313858C52 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-IronPort-AV: E=Sophos;i="5.93,334,1654588800"; d="scan'208,223";a="86187587" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 21 Sep 2022 13:18:55 -0800 IronPort-SDR: YmC6lVfywhYhFJL7irIrjB2Vew++A6CGsSPqXG2gz0N985uHsnrA3ZGN4W2IMPmoKeg2WuVTFW BefMaYe6HZcuvEnb4y6HpYBjZT3FaXwICPdycp7BBCA9vGPSmnhPQgm5icV94Q/LRMydafbtFX +QV+bIjTxZLpT/a0wLy4U5Zi1bndU6bzqozzoKcwGfB1Ngs+Ba2OSpbMsuf6/cGTFIek+pm4Pr ZUxpHYPLY/D3XGP3BV7k60UN52N9GuJWsUk5maUF7/i02gac3wF4AkJzzoygp01l/+ekiuXGj8 C88= Content-Type: multipart/mixed; boundary="------------xwIeBB8eaS2XPdyx7fVVt33G" Message-ID: Date: Wed, 21 Sep 2022 23:18:50 +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 ICE with OMP metadirectives X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-07.mgc.mentorg.com (139.181.222.7) To svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) X-Spam-Status: No, score=-12.9 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: --------------xwIeBB8eaS2XPdyx7fVVt33G Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Hello, Here is a patch that fixes an ICE in gfortran triggered by an invalid end statement at the end of an OMP metadirective: ``` !$OMP metadirective ... ... !$OMP end ... ``` Does this fix look correct? Thanks, -- Paul-Antoine Arras --------------xwIeBB8eaS2XPdyx7fVVt33G Content-Type: text/plain; charset="UTF-8"; name="0001-OpenMP-Fix-ICE-with-OMP-metadirectives.patch" Content-Disposition: attachment; filename="0001-OpenMP-Fix-ICE-with-OMP-metadirectives.patch" Content-Transfer-Encoding: base64 RnJvbSA3M2VjYmMyNjcyYTUzNTJhMDgyNjBmN2E5ZDBkZTZkMmMyOWVhMmI2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsLUFudG9pbmUgQXJyYXMgPHBhQGNvZGVzb3Vy Y2VyeS5jb20+CkRhdGU6IFdlZCwgMjEgU2VwIDIwMjIgMTU6NTI6NTYgKzAwMDAKU3ViamVj dDogW1BBVENIXSBPcGVuTVA6IEZpeCBJQ0Ugd2l0aCBPTVAgbWV0YWRpcmVjdGl2ZXMKClBy b2JsZW06IGVuZGluZyBhbiBPcGVuTVAgbWV0YWRpcmVjdGl2ZSBibG9jayB3aXRoIGFuIE9N UCBlbmQgc3RhdGVtZW50CnJlc3VsdHMgaW4gYW4gaW50ZXJuYWwgY29tcGlsZXIgZXJyb3Iu ClNvbHV0aW9uOiByZWplY3QgaW52YWxpZCBlbmQgc3RhdGVtZW50cyBhbmQgaXNzdWUgYSBw cm9wZXIgZGlhZ25vc3RpYy4KCkFsc28gYWRkIGEgbmV3IHRlc3QgdG8gY2hlY2sgdGhpcyBi ZWhhdmlvdXIuCgpnY2MvZm9ydHJhbi9DaGFuZ2VMb2c6CgoJKiBwYXJzZS5jYyAocGFyc2Vf b21wX21ldGFkaXJlY3RpdmVfYm9keSk6IFJlamVjdCBPTVAgZW5kIHN0YXRlbWVudHMKCWF0 IHRoZSBlbmQgb2YgYW4gT01QIG1ldGFkaXJlY3RpdmUuCgpnY2MvdGVzdHN1aXRlL0NoYW5n ZUxvZzoKCgkqIGdmb3J0cmFuLmRnL2dvbXAvbWV0YWRpcmVjdGl2ZS05LmY5MDogTmV3IHRl c3QuCi0tLQogZ2NjL2ZvcnRyYW4vQ2hhbmdlTG9nLm9tcCAgICAgICAgICAgICAgICAgICAg IHwgIDUgKysrKwogZ2NjL2ZvcnRyYW4vcGFyc2UuY2MgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgMTQgKysrKysrKysrCiBnY2MvdGVzdHN1aXRlL0NoYW5nZUxvZy5vbXAgICAgICAg ICAgICAgICAgICAgfCAgNCArKysKIC4uLi9nZm9ydHJhbi5kZy9nb21wL21ldGFkaXJlY3Rp dmUtOS5mOTAgICAgICB8IDI5ICsrKysrKysrKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdl ZCwgNTIgaW5zZXJ0aW9ucygrKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGdjYy90ZXN0c3VpdGUv Z2ZvcnRyYW4uZGcvZ29tcC9tZXRhZGlyZWN0aXZlLTkuZjkwCgpkaWZmIC0tZ2l0IGdjYy9m b3J0cmFuL0NoYW5nZUxvZy5vbXAgZ2NjL2ZvcnRyYW4vQ2hhbmdlTG9nLm9tcAppbmRleCA4 Yzg5Y2Q1YmQ0My4uN2IyNTM2MDhiZjggMTAwNjQ0Ci0tLSBnY2MvZm9ydHJhbi9DaGFuZ2VM b2cub21wCisrKyBnY2MvZm9ydHJhbi9DaGFuZ2VMb2cub21wCkBAIC0xLDMgKzEsOCBAQAor MjAyMi0wOS0yMSAgUGF1bC1BbnRvaW5lIEFycmFzICA8cGFAY29kZXNvdXJjZXJ5LmNvbT4K KworICAgICAgICAqIHBhcnNlLmNjIChwYXJzZV9vbXBfbWV0YWRpcmVjdGl2ZV9ib2R5KTog UmVqZWN0IE9NUCBlbmQgc3RhdGVtZW50cworICAgICAgICBhdCB0aGUgZW5kIG9mIGFuIE9N UCBtZXRhZGlyZWN0aXZlLgorCiAyMDIyLTA5LTA5ICBUb2JpYXMgQnVybnVzICA8dG9iaWFz QGNvZGVzb3VyY2VyeS5jb20+CiAKIAlCYWNrcG9ydCBmcm9tIG1haW5saW5lOgpkaWZmIC0t Z2l0IGdjYy9mb3J0cmFuL3BhcnNlLmNjIGdjYy9mb3J0cmFuL3BhcnNlLmNjCmluZGV4IGIz NWQ3NmE0ZjZiLi4xZjFmYTBlYmEwZSAxMDA2NDQKLS0tIGdjYy9mb3J0cmFuL3BhcnNlLmNj CisrKyBnY2MvZm9ydHJhbi9wYXJzZS5jYwpAQCAtNTg2Myw2ICs1ODYzLDIwIEBAIHBhcnNl X29tcF9tZXRhZGlyZWN0aXZlX2JvZHkgKGdmY19zdGF0ZW1lbnQgb21wX3N0KQogCSAgYnJl YWs7CiAJfQogCisgICAgICBpZiAoZ2ZjX3N0YXRlX3N0YWNrLT5zdGF0ZSA9PSBDT01QX09N UF9NRVRBRElSRUNUSVZFCisJICAmJiBzdGFydHN3aXRoIChnZmNfYXNjaWlfc3RhdGVtZW50 IChzdCksICIhJE9NUCBFTkQgIikpCisJeworCSAgZm9yIChnZmNfc3RhdGVfZGF0YSAqcCA9 IGdmY19zdGF0ZV9zdGFjazsgcDsgcCA9IHAtPnByZXZpb3VzKQorCSAgICBpZiAocC0+c3Rh dGUgPT0gQ09NUF9PTVBfU1RSVUNUVVJFRF9CTE9DSykKKwkgICAgICBnb3RvIGZpbmlzaDsK KwkgIGdmY19lcnJvciAoCisJICAgICJVbmV4cGVjdGVkICVzIHN0YXRlbWVudCBpbiBhbiBP TVAgTUVUQURJUkVDVElWRSBibG9jayBhdCAlQyIsCisJICAgIGdmY19hc2NpaV9zdGF0ZW1l bnQgKHN0KSk7CisJICByZWplY3Rfc3RhdGVtZW50ICgpOworCSAgc3QgPSBuZXh0X3N0YXRl bWVudCAoKTsKKwl9CisgICAgZmluaXNoOgorCiAgICAgICBnZmNfaW5fbWV0YWRpcmVjdGl2 ZV9ib2R5ID0gb2xkX2luX21ldGFkaXJlY3RpdmVfYm9keTsKIAogICAgICAgaWYgKGdmY19z dGF0ZV9zdGFjay0+aGVhZCkKZGlmZiAtLWdpdCBnY2MvdGVzdHN1aXRlL0NoYW5nZUxvZy5v bXAgZ2NjL3Rlc3RzdWl0ZS9DaGFuZ2VMb2cub21wCmluZGV4IGUwYzhjMTM4NjIwLi5mMDc1 MzU0YWY0ZCAxMDA2NDQKLS0tIGdjYy90ZXN0c3VpdGUvQ2hhbmdlTG9nLm9tcAorKysgZ2Nj L3Rlc3RzdWl0ZS9DaGFuZ2VMb2cub21wCkBAIC0xLDMgKzEsNyBAQAorMjAyMi0wOS0yMSAg UGF1bC1BbnRvaW5lIEFycmFzICA8cGFAY29kZXNvdXJjZXJ5LmNvbT4KKworICAgICAgICAq IGdmb3J0cmFuLmRnL2dvbXAvbWV0YWRpcmVjdGl2ZS05LmY5MDogTmV3IHRlc3QuCisKIDIw MjItMDktMDkgIFBhdWwtQW50b2luZSBBcnJhcyAgPHBhQGNvZGVzb3VyY2VyeS5jb20+CiAK IAlCYWNrcG9ydCBmcm9tIG1haW5saW5lOgpkaWZmIC0tZ2l0IGdjYy90ZXN0c3VpdGUvZ2Zv cnRyYW4uZGcvZ29tcC9tZXRhZGlyZWN0aXZlLTkuZjkwIGdjYy90ZXN0c3VpdGUvZ2ZvcnRy YW4uZGcvZ29tcC9tZXRhZGlyZWN0aXZlLTkuZjkwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwLi40ZGIzN2RkMGVmOQotLS0gL2Rldi9udWxsCisrKyBnY2MvdGVz dHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAvbWV0YWRpcmVjdGl2ZS05LmY5MApAQCAtMCwwICsx LDI5IEBACishIHsgZGctZG8gY29tcGlsZSB9CisKK3Byb2dyYW0gT3Blbk1QX01ldGFkaXJl Y3RpdmVfV3JvbmdFbmRfVGVzdAorCisgIGludGVnZXIgOjogJgorICAgIGlWLCBqViwga1YK KyAgaW50ZWdlciwgZGltZW5zaW9uICggMyApIDo6ICYKKyAgICBsViwgdVYKKyAgbG9naWNh bCA6OiAmCisgICAgVXNlRGV2aWNlCisKKyAgICAhJE9NUCBtZXRhZGlyZWN0aXZlICYKKyAg ICAhJE9NUCAgIHdoZW4gKCB1c2VyID0geyBjb25kaXRpb24gKCBVc2VEZXZpY2UgKSB9ICYK KyAgICAhJE9NUCAgICAgOiB0YXJnZXQgdGVhbXMgZGlzdHJpYnV0ZSBwYXJhbGxlbCBkbyBz aW1kIGNvbGxhcHNlICggMyApICYKKyAgICAhJE9NUCAgICAgICAgIHByaXZhdGUgKCBpYVZT ICkgKSAmCisgICAgISRPTVAgICBkZWZhdWx0ICggcGFyYWxsZWwgZG8gc2ltZCBjb2xsYXBz ZSAoIDMgKSBwcml2YXRlICggaWFWUyApICkKKyAgICBkbyBrViA9IGxWICggMyApLCB1ViAo IDMgKQorICAgICAgZG8galYgPSBsViAoIDIgKSwgdVYgKCAyICkKKyAgICAgICAgZG8gaVYg PSBsViAoIDEgKSwgdVYgKCAxICkKKworCisgICAgICAgIGVuZCBkbworICAgICAgZW5kIGRv CisgICAgZW5kIGRvCisgICAgISRPTVAgZW5kIHRhcmdldCB0ZWFtcyBkaXN0cmlidXRlIHBh cmFsbGVsIGRvIHNpbWQgISB7IGRnLWVycm9yICJVbmV4cGVjdGVkICEuT01QIEVORCBUQVJH RVQgVEVBTVMgRElTVFJJQlVURSBQQVJBTExFTCBETyBTSU1EIHN0YXRlbWVudCBpbiBhbiBP TVAgTUVUQURJUkVDVElWRSBibG9jayBhdCAuMS4iIH0KKworCitlbmQgcHJvZ3JhbQorCi0t IAoyLjMxLjEKCg== --------------xwIeBB8eaS2XPdyx7fVVt33G--