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 A1F1A3858C83; Mon, 28 Feb 2022 14:02:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A1F1A3858C83 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,142,1643702400"; d="scan'208,223";a="75068294" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 28 Feb 2022 06:02:03 -0800 IronPort-SDR: N5F/5lvIjiVkHXmlfHoEVpmISoO5ZGVmUrrdKWswMqXMyMPc70WXK3QUGfcmlvF6bfbCkBozZf Mctwes89AlEgB2FgwpeYEQ38R/Y0jVseifXNG21DPKL7tGeSZai9x+v/a0VSJfHn6dcfkvQPH5 B8Ab5OFshvXeFVjnUdmLUPFUlHzMGArNZO0UmAfSdJRzbutpYOT732qCtZGW4l4PaePqgM0rDQ PsuW6gpNIcNHIMItdcI82Z8Mm03INM80CsPxnS8IjZlC3ZigLfXpGnI6qRQztHGMqBd74cH/DL ogE= Content-Type: multipart/mixed; boundary="------------PYEwxKd6jgENmPB6kssc2kHF" Message-ID: Date: Mon, 28 Feb 2022 14:01:03 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 From: Kwok Cheung Yeung Subject: [PATCH] openmp, fortran: Check that event handles passed to detach clauses are not arrays [PR104131] To: gcc-patches , fortran , Jakub Jelinek , X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-07.mgc.mentorg.com (139.181.222.7) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) X-Spam-Status: No, score=-11.9 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: Mon, 28 Feb 2022 14:02:27 -0000 --------------PYEwxKd6jgENmPB6kssc2kHF Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Hello This patch addresses PR fortran/104131 on the GCC bug tracker, where an ICE would occur if an array or co-array was passed as the event handle in the detach clause of a task. Since the event handle is supposed to be a scalar of type omp_event_handle_kind, we can simply reject the event handle during parsing if it is any type of array, thereby preventing the situation leading to an ICE in the first place. Okay for trunk? Thanks Kwok --------------PYEwxKd6jgENmPB6kssc2kHF Content-Type: text/plain; charset="UTF-8"; name="0001-openmp-fortran-Check-that-event-handles-passed-to-de.patch" Content-Disposition: attachment; filename*0="0001-openmp-fortran-Check-that-event-handles-passed-to-de.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA4ZWQzYjhiZDc5MzI5OGY5NGJkZWZiZGZmMzJmOTFlYWVhMWE5ZDcwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBLd29rIENoZXVuZyBZZXVuZyA8a2N5QGNvZGVzb3Vy Y2VyeS5jb20+CkRhdGU6IE1vbiwgMjggRmViIDIwMjIgMTI6MzQ6MjIgKzAwMDAKU3ViamVj dDogW1BBVENIXSBvcGVubXAsIGZvcnRyYW46IENoZWNrIHRoYXQgZXZlbnQgaGFuZGxlcyBw YXNzZWQgdG8gZGV0YWNoCiBjbGF1c2VzIGFyZSBub3QgYXJyYXlzIFtQUjEwNDEzMV0KCjIw MjItMDItMjggIEt3b2sgQ2hldW5nIFlldW5nICA8a2N5QGNvZGVzb3VyY2VyeS5jb20+Cgpn Y2MvZm9ydHJhbi8KCglQUiBmb3J0cmFuLzEwNDEzMQoJKiBvcGVubXAuY2MgKGdmY19tYXRj aF9vbXBfZGV0YWNoKTogQ2hlY2sgdGhhdCB0aGUgZXZlbnQgaGFuZGxlIGlzIG5vdAoJYW4g YXJyYXkgdHlwZS4KCmdjYy90ZXN0c3VpdGUvCgoJUFIgZm9ydHJhbi8xMDQxMzEKCSogZ2Zv cnRyYW4uZGcvZ29tcC9wcjEwNDEzMS5mOTA6IE5ldy4KCSogZ2ZvcnRyYW4uZGcvZ29tcC9w cjEwNDEzMS0yLmY5MDogTmV3LgoJKiBnZm9ydHJhbi5kZy9nb21wL3Rhc2stZGV0YWNoLTEu ZjkwOiBVcGRhdGUgZXhwZWN0ZWQgZXJyb3IgbWVzc2FnZS4KLS0tCiBnY2MvZm9ydHJhbi9v cGVubXAuY2MgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgNSArKystLQogZ2NjL3Rl c3RzdWl0ZS9nZm9ydHJhbi5kZy9nb21wL3ByMTA0MTMxLTIuZjkwICAgIHwgMTAgKysrKysr KysrKwogZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9nb21wL3ByMTA0MTMxLmY5MCAgICAg IHwgMTAgKysrKysrKysrKwogZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9nb21wL3Rhc2st ZGV0YWNoLTEuZjkwIHwgIDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygr KSwgMyBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBnY2MvdGVzdHN1aXRlL2dm b3J0cmFuLmRnL2dvbXAvcHIxMDQxMzEtMi5mOTAKIGNyZWF0ZSBtb2RlIDEwMDY0NCBnY2Mv dGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAvcHIxMDQxMzEuZjkwCgpkaWZmIC0tZ2l0IGEv Z2NjL2ZvcnRyYW4vb3Blbm1wLmNjIGIvZ2NjL2ZvcnRyYW4vb3Blbm1wLmNjCmluZGV4IDE5 MTQyYzRkOGQwLi41MGExYzQ3NjAwOSAxMDA2NDQKLS0tIGEvZ2NjL2ZvcnRyYW4vb3Blbm1w LmNjCisrKyBiL2djYy9mb3J0cmFuL29wZW5tcC5jYwpAQCAtNTMxLDkgKzUzMSwxMCBAQCBn ZmNfbWF0Y2hfb21wX2RldGFjaCAoZ2ZjX2V4cHIgKipleHByKQogICBpZiAoZ2ZjX21hdGNo X3ZhcmlhYmxlIChleHByLCAwKSAhPSBNQVRDSF9ZRVMpCiAgICAgZ290byBzeW50YXhfZXJy b3I7CiAKLSAgaWYgKCgqZXhwciktPnRzLnR5cGUgIT0gQlRfSU5URUdFUiB8fCAoKmV4cHIp LT50cy5raW5kICE9IGdmY19jX2ludHB0cl9raW5kKQorICBpZiAoKCpleHByKS0+dHMudHlw ZSAhPSBCVF9JTlRFR0VSIHx8ICgqZXhwciktPnRzLmtpbmQgIT0gZ2ZjX2NfaW50cHRyX2tp bmQKKyAgICAgIHx8ICgqZXhwciktPnN5bXRyZWUtPm4uc3ltLT5hcykKICAgICB7Ci0gICAg ICBnZmNfZXJyb3IgKCIlcXMgYXQgJUwgc2hvdWxkIGJlIG9mIHR5cGUgIgorICAgICAgZ2Zj X2Vycm9yICgiJXFzIGF0ICVMIHNob3VsZCBiZSBhIHNjYWxhciBvZiB0eXBlICIKIAkJICJp bnRlZ2VyKGtpbmQ9b21wX2V2ZW50X2hhbmRsZV9raW5kKSIsCiAJCSAoKmV4cHIpLT5zeW10 cmVlLT5uLnN5bS0+bmFtZSwgJigqZXhwciktPndoZXJlKTsKICAgICAgIHJldHVybiBNQVRD SF9FUlJPUjsKZGlmZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvZ29tcC9w cjEwNDEzMS0yLmY5MCBiL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvZ29tcC9wcjEwNDEz MS0yLmY5MApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uOGQxMDM2 N2JhM2IKLS0tIC9kZXYvbnVsbAorKysgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dv bXAvcHIxMDQxMzEtMi5mOTAKQEAgLTAsMCArMSwxMCBAQAorISB7IGRnLWRvIGNvbXBpbGUg fQorISB7IGRnLW9wdGlvbnMgIi1mb3Blbm1wIC1mY29hcnJheT1zaW5nbGUiIH0KKworcHJv Z3JhbSBwCisgIHVzZSBpc29fY19iaW5kaW5nLCBvbmx5OiBjX2ludHB0cl90CisgIGludGVn ZXIsIHBhcmFtZXRlciA6OiBvbXBfZXZlbnRfaGFuZGxlX2tpbmQgPSBjX2ludHB0cl90Cisg IGludGVnZXIgKGtpbmQ9b21wX2V2ZW50X2hhbmRsZV9raW5kKSA6OiB4WypdCisgICEkb21w IHRhc2sgZGV0YWNoICh4KSAhIHsgZGctZXJyb3IgIid4JyBhdCBcXFwoMVxcXCkgc2hvdWxk IGJlIGEgc2NhbGFyIG9mIHR5cGUgaW50ZWdlclxcXChraW5kPW9tcF9ldmVudF9oYW5kbGVf a2luZFxcXCkiIH0KKyAgISRvbXAgZW5kIHRhc2sgISB7IGRnLWVycm9yICJVbmV4cGVjdGVk ICFcXFwkT01QIEVORCBUQVNLIHN0YXRlbWVudCBhdCBcXFwoMVxcXCkiIH0KK2VuZApkaWZm IC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9nb21wL3ByMTA0MTMxLmY5MCBi L2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvZ29tcC9wcjEwNDEzMS5mOTAKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjcwYTJkZWRmZDdmCi0tLSAvZGV2L251 bGwKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9nb21wL3ByMTA0MTMxLmY5MApA QCAtMCwwICsxLDEwIEBACishIHsgZGctZG8gY29tcGlsZSB9CishIHsgZGctb3B0aW9ucyAi LWZvcGVubXAiIH0KKworcHJvZ3JhbSBwCisgIHVzZSBpc29fY19iaW5kaW5nLCBvbmx5OiBj X2ludHB0cl90CisgIGludGVnZXIsIHBhcmFtZXRlciA6OiBvbXBfZXZlbnRfaGFuZGxlX2tp bmQgPSBjX2ludHB0cl90CisgIGludGVnZXIob21wX2V2ZW50X2hhbmRsZV9raW5kKSA6OiB4 KDEpCisgICEkb21wIHRhc2sgZGV0YWNoKHgpICEgeyBkZy1lcnJvciAiJ3gnIGF0IFxcXCgx XFxcKSBzaG91bGQgYmUgYSBzY2FsYXIgb2YgdHlwZSBpbnRlZ2VyXFxcKGtpbmQ9b21wX2V2 ZW50X2hhbmRsZV9raW5kXFxcKSIgfQorICAhJG9tcCBlbmQgdGFzayAhIHsgZGctZXJyb3Ig IlVuZXhwZWN0ZWQgIVxcXCRPTVAgRU5EIFRBU0sgc3RhdGVtZW50IGF0IFxcXCgxXFxcKSIg fQorZW5kCmRpZmYgLS1naXQgYS9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAvdGFz ay1kZXRhY2gtMS5mOTAgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAvdGFzay1k ZXRhY2gtMS5mOTAKaW5kZXggMDIwYmUxM2E4YjYuLmI3M2RiMDdiN2MzIDEwMDY0NAotLS0g YS9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAvdGFzay1kZXRhY2gtMS5mOTAKKysr IGIvZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9nb21wL3Rhc2stZGV0YWNoLTEuZjkwCkBA IC0xOCw3ICsxOCw3IEBAIHByb2dyYW0gdGFza19kZXRhY2hfMQogICAhJG9tcCB0YXNrIGRl dGFjaCh4KSBtZXJnZWFibGUgISB7IGRnLWVycm9yICInREVUQUNIJyBjbGF1c2UgYXQgXFxc KDFcXFwpIG11c3Qgbm90IGJlIHVzZWQgdG9nZXRoZXIgd2l0aCAnTUVSR0VBQkxFJyBjbGF1 c2UiIH0KICAgISRvbXAgZW5kIHRhc2sKIAotICAhJG9tcCB0YXNrIGRldGFjaCh6KSAhIHsg ZGctZXJyb3IgIid6JyBhdCBcXFwoMVxcXCkgc2hvdWxkIGJlIG9mIHR5cGUgaW50ZWdlclxc XChraW5kPW9tcF9ldmVudF9oYW5kbGVfa2luZFxcXCkiIH0KKyAgISRvbXAgdGFzayBkZXRh Y2goeikgISB7IGRnLWVycm9yICIneicgYXQgXFxcKDFcXFwpIHNob3VsZCBiZSBhIHNjYWxh ciBvZiB0eXBlIGludGVnZXJcXFwoa2luZD1vbXBfZXZlbnRfaGFuZGxlX2tpbmRcXFwpIiB9 CiAgICEkb21wIGVuZCB0YXNrICEgeyBkZy1lcnJvciAiVW5leHBlY3RlZCAhXFxcJE9NUCBF TkQgVEFTSyBzdGF0ZW1lbnQgYXQgXFxcKDFcXFwpIiB9CiAgIAogICAhJG9tcCB0YXNrIGRl dGFjaCAoeCkgZmlyc3Rwcml2YXRlICh4KSAhIHsgZGctZXJyb3IgIkRFVEFDSCBldmVudCBo YW5kbGUgJ3gnIGluIEZJUlNUUFJJVkFURSBjbGF1c2UgYXQgXFxcKDFcXFwpIiB9Ci0tIAoy LjI1LjEKCg== --------------PYEwxKd6jgENmPB6kssc2kHF--