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 E0BD0385842B; Sat, 26 Mar 2022 02:02:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E0BD0385842B 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.90,211,1643702400"; d="scan'208";a="76224182" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 25 Mar 2022 18:02:11 -0800 IronPort-SDR: nc103J08Ay0H/ohSIQB18/U+r9zaCZX5W7EDclTXTX8vgujCLVCPFHX3GEc5ty4nxhiXifaH2j oZxfNY9oag+0oJGaLQJ7Be2j6VhYsg1AAmeUwjnXNDsai5rt7jymRQ/G9D4i6nhSaurVuc+2L9 gLtKbmKNxGs9GV8nWdjwoFU+zFm9wJpMg6Kb4NRFFV/nIvcQZAGae+VAmy940GvQrTzEuQmofa m70oZ/BUicU7SKoEn1Nbe3X8X1MxkOnCble0RSYBmpT1SJXpT+H7f37PINr49C20SFmPxclh1W INA= Content-Type: multipart/mixed; boundary="------------2mR0ejnBvVtmcfp7fi9IJYvN" Message-ID: <5061c0a0-563d-b18e-dc5e-36142ae185ec@codesourcery.com> Date: Fri, 25 Mar 2022 20:02:04 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: "fortran@gcc.gnu.org" CC: "gcc-patches@gcc.gnu.org" From: Sandra Loosemore Subject: [PATCH] Fortran: Fix clause splitting for OMP masked taskloop directive X-ClientProxiedBy: svr-orw-mbx-10.mgc.mentorg.com (147.34.90.210) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2022 02:02:14 -0000 --------------2mR0ejnBvVtmcfp7fi9IJYvN Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit I ran into this bug in the handling of clauses on the combined "masked taskloop" OMP directive when I was working on something else. The fix turned out to be a 1-liner. OK for trunk? -Sandra --------------2mR0ejnBvVtmcfp7fi9IJYvN Content-Type: text/x-patch; charset="UTF-8"; name="masked-taskloop-bugfix.patch" Content-Disposition: attachment; filename="masked-taskloop-bugfix.patch" Content-Transfer-Encoding: base64 Y29tbWl0IDE3YzRmYTBiZDk3YzA3MDk0NTAwNDA5NWEwNmZiN2Q5ZTkxODY5ZTMKQXV0aG9y OiBTYW5kcmEgTG9vc2Vtb3JlIDxzYW5kcmFAY29kZXNvdXJjZXJ5LmNvbT4KRGF0ZTogICBX ZWQgTWFyIDIzIDE4OjQ1OjI1IDIwMjIgLTA3MDAKCiAgICBGb3J0cmFuOiBGaXggY2xhdXNl IHNwbGl0dGluZyBmb3IgT01QIG1hc2tlZCB0YXNrbG9vcCBkaXJlY3RpdmUKICAgIAogICAg VGhpcyBwYXRjaCBmaXhlcyBhbiBvYnZpb3VzIGNvZGluZyBnb29mIHRoYXQgY2F1c2VkIGFs bCBjbGF1c2VzIGZvcgogICAgdGhlIGNvbWJpbmVkIE9NUCBtYXNrZWQgdGFza2xvb3AgZGly ZWN0aXZlIHRvIGJlIGRpc2NhcmRlZC4KICAgIAogICAgCWdjYy9mb3J0cmFuLwogICAgCSog dHJhbnMtb3Blbm1wLmNjIChnZmNfc3BsaXRfb21wX2NsYXVzZXMpOiBGaXggbWFzayBmb3IK ICAgIAlFWEVDX09NUF9NQVNLRURfVEFTS0xPT1AuCiAgICAKICAgIAlnY2MvdGVzdHN1aXRl LwogICAgCSogZ2ZvcnRyYW4uZGcvZ29tcC9tYXNrZWQtdGFza2xvb3AuZjkwOiBOZXcuCgpk aWZmIC0tZ2l0IGEvZ2NjL2ZvcnRyYW4vdHJhbnMtb3Blbm1wLmNjIGIvZ2NjL2ZvcnRyYW4v dHJhbnMtb3Blbm1wLmNjCmluZGV4IDEwMTkyNGYuLjI1ZGRlODIgMTAwNjQ0Ci0tLSBhL2dj Yy9mb3J0cmFuL3RyYW5zLW9wZW5tcC5jYworKysgYi9nY2MvZm9ydHJhbi90cmFucy1vcGVu bXAuY2MKQEAgLTU5OTgsNyArNTk5OCw3IEBAIGdmY19zcGxpdF9vbXBfY2xhdXNlcyAoZ2Zj X2NvZGUgKmNvZGUsCiAgICAgICBpbm5lcm1vc3QgPSBHRkNfT01QX1NQTElUX0RPOwogICAg ICAgYnJlYWs7CiAgICAgY2FzZSBFWEVDX09NUF9NQVNLRURfVEFTS0xPT1A6Ci0gICAgICBt YXNrID0gR0ZDX09NUF9TUExJVF9NQVNLRUQgfCBHRkNfT01QX1NQTElUX1RBU0tMT09QOwor ICAgICAgbWFzayA9IEdGQ19PTVBfTUFTS19NQVNLRUQgfCBHRkNfT01QX01BU0tfVEFTS0xP T1A7CiAgICAgICBpbm5lcm1vc3QgPSBHRkNfT01QX1NQTElUX1RBU0tMT09QOwogICAgICAg YnJlYWs7CiAgICAgY2FzZSBFWEVDX09NUF9NQVNURVJfVEFTS0xPT1A6CmRpZmYgLS1naXQg YS9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAvbWFza2VkLXRhc2tsb29wLmY5MCBi L2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvZ29tcC9tYXNrZWQtdGFza2xvb3AuZjkwCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjZmYjcxMTEKLS0tIC9kZXYvbnVs bAorKysgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAvbWFza2VkLXRhc2tsb29w LmY5MApAQCAtMCwwICsxLDE5IEBACishIHsgZGctZG8gY29tcGlsZSB9CishIHsgZGctYWRk aXRpb25hbC1vcHRpb25zICItZm9wZW5tcCAtZmR1bXAtdHJlZS1vcmlnaW5hbCIgfQorCish IFRoZXJlIHdhcyBhIGJ1ZyBpbiB0aGUgY2xhdXNlIHNwbGl0dGluZyBmb3IgdGhlICJtYXNr ZWQgdGFza2xvb3AiCishIGNvbWJpbmVkIGRpcmVjdGl2ZSB0aGF0IGNhdXNlZCBpdCB0byBs b3NlIGFsbCB0aGUgY2xhdXNlcy4KKworc3Vicm91dGluZSBzMSAoYTEsIGEyKQorICBpbnRl Z2VyIDo6IGExLCBhMgorICBpbnRlZ2VyIDo6IGksIGoKKworICAhJG9tcCBtYXNrZWQgdGFz a2xvb3AgY29sbGFwc2UoMikgZ3JhaW5zaXplKDQpCisgIGRvIGkgPSAxLCBhMQorICAgIGRv IGogPSAxLCBhMgorICAgIGVuZCBkbworICBlbmQgZG8KKworZW5kIHN1YnJvdXRpbmUKKwor ISB7IGRnLWZpbmFsIHsgc2Nhbi10cmVlLWR1bXAgIm9tcCB0YXNrbG9vcCBjb2xsYXBzZVxc KDJcXCkgZ3JhaW5zaXplXFwoNFxcKSIgIm9yaWdpbmFsIiB9IH0K --------------2mR0ejnBvVtmcfp7fi9IJYvN--