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 248023858412; Mon, 14 Feb 2022 15:17:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 248023858412 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: qC/UK5tdl3HLIu3Fiy/sB6IgY72p55v3LAPnfo/YT0SJeygyRgBzwId/J9ZMqZp/yIAhrqvowr 3kVHwa1irGZwc9VipaImF495mwiokvOzRuzlFXPbMbSjH2+FQTqQF8OoRTdhNjGLiqMxEPz7Wr InpJzdgHoW0fVbAaxo1lfWOv3cOY+BWZQg7iF9IHqT2srn1D6+4Ho2QC6UcHbkazeZVQo5gzKq DFPvhpp76YRZBlpPnm1UNALPAI4D54p4z/9/4cb6cYxg//ZRdKSE0N8jh5kkasjz8/EYWp78a6 8oMEbh1kATBK3lR0iwSzUJNx X-IronPort-AV: E=Sophos;i="5.88,368,1635235200"; d="scan'208,223";a="71800130" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 14 Feb 2022 07:17:42 -0800 IronPort-SDR: UJ6dooCNGXWHV+Xwc8DTggzzJr65xHGz6+BLxqrO+qYQQ4bPhEZtl461YkFD0snmRMO+6MdgJL dUI84m7Aa/beZxp+Sj649yTYjFTX14zHcnn0ZcXzf8Y8+cjr3Yn877r8I0Tx5qvEXGY6i5Tcwc nw3QMnWV33u+WTr4nzxGXw6gEGEZoOVTwUznfAi2at4+B4Y3IEm54bNbsYAaUyAj4MM757aRtb dtD0uSI2Q8CjDz/rKod9Iy7UbR3+cgr24hwOcf5bhENWcs+tsf/PjFa88CBlha34uPLbPBpnah t1o= Content-Type: multipart/mixed; boundary="------------dMsKB0JS0etDQ9gZ8GcLzXA8" Message-ID: <3d114d43-ce2c-e2d2-b477-98a15fce16c3@codesourcery.com> Date: Mon, 14 Feb 2022 15:17:06 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 To: gcc-patches , fortran , Jakub Jelinek References: <88facbcc-5be6-5c3b-1e73-f5ceba75ef6f@codesourcery.com> Subject: Re: [PATCH 6/7] openmp, fortran: Add Fortran support for parsing metadirectives From: Kwok Cheung Yeung In-Reply-To: <88facbcc-5be6-5c3b-1e73-f5ceba75ef6f@codesourcery.com> X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-15.mgc.mentorg.com (139.181.222.15) 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, NICE_REPLY_A, 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, 14 Feb 2022 15:17:45 -0000 --------------dMsKB0JS0etDQ9gZ8GcLzXA8 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit This patch (again, to be applied on top of the current set of metadirective patches) fixes two minor issues with metadirectives in the Fortran front-end. - 'sorry' is called if a declarative OpenMP directive is found in a metadirective clause. - An ICE that occurs with an empty metadirective (i.e. just '!$omp metadirective' with nothing else) is fixed. Thanks Kwok --------------dMsKB0JS0etDQ9gZ8GcLzXA8 Content-Type: text/plain; charset="UTF-8"; name="0002-openmp-More-Fortran-front-end-fixes-for-metadirectiv.patch" Content-Disposition: attachment; filename*0="0002-openmp-More-Fortran-front-end-fixes-for-metadirectiv.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAxNTNiOGRiZDE5Y2Y5MGIxODY5YmU3ZjQwOWQ1NWQxYWI1YmE4MWQ1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBLd29rIENoZXVuZyBZZXVuZyA8a2N5QGNvZGVzb3Vy Y2VyeS5jb20+CkRhdGU6IEZyaSwgMTEgRmViIDIwMjIgMTU6NDI6NTAgKzAwMDAKU3ViamVj dDogW1BBVENIIDIvMl0gb3Blbm1wOiBNb3JlIEZvcnRyYW4gZnJvbnQtZW5kIGZpeGVzIGZv ciBtZXRhZGlyZWN0aXZlcwoKVGhpcyBhZGRzIGEgY2hlY2sgZm9yIGRlY2xhcmF0aXZlIE9w ZW5NUCBkaXJlY3RpdmVzIGluIG1ldGFkaXJlY3RpdmUKdmFyaWFudHMgKGFscmVhZHkgcHJl c2VudCBpbiB0aGUgQy9DKysgZnJvbnQtZW5kcyksIGFuZCBmaXhlcyBhbgpJQ0Ugd2hlbiBh biBlbXB0eSBtZXRhZGlyZWN0aXZlIChpLmUuIGp1c3QgJyEkb21wIG1ldGFkaXJlY3RpdmUn KQppcyBwcmVzZW50ZWQuCgoyMDIyLTAyLTExICBLd29rIENoZXVuZyBZZXVuZyAgPGtjeUBj b2Rlc291cmNlcnkuY29tPgoKCWdjYy9mb3J0cmFuLwoJKiBnZm9ydHJhbi5oIChpc19vbXBf ZGVjbGFyYXRpdmVfc3RtdCk6IE5ldy4KCSogb3Blbm1wLmNjIChtYXRjaF9vbXBfbWV0YWRp cmVjdGl2ZSk6IFJlamVjdCBkZWNsYXJhdGl2ZSBPcGVuTVAKCWRpcmVjdGl2ZXMgd2l0aCAn c29ycnknLgoJKiBwYXJzZS5jYyAocGFyc2Vfb21wX21ldGFkaXJlY3RpdmVfYm9keSk6IENo ZWNrIHRoYXQgc3RhdGUgc3RhY2sgaGVhZAoJaXMgbm9uLW51bGwgYmVmb3JlIGRlcmVmZXJl bmNpbmcuCgkoaXNfb21wX2RlY2xhcmF0aXZlX3N0bXQpOiBOZXcuCgoJZ2NjL3Rlc3RzdWl0 ZS8KCSogZ2ZvcnRyYW4uZGcvZ29tcC9tZXRhZGlyZWN0aXZlLTIuZjkwIChtYWluKTogVGVz dCBlbXB0eQoJbWV0YWRpcmVjdGl2ZS4KLS0tCiBnY2MvZm9ydHJhbi9nZm9ydHJhbi5oICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgMSArCiBnY2MvZm9ydHJhbi9vcGVubXAuY2Mg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMyArKysKIGdjYy9mb3J0cmFuL3BhcnNl LmNjICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IDE2ICsrKysrKysrKysrKysrKy0K IC4uLi9nZm9ydHJhbi5kZy9nb21wL21ldGFkaXJlY3RpdmUtMi5mOTAgICAgICAgICB8ICA1 ICsrKystCiA0IGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZ2NjL2ZvcnRyYW4vZ2ZvcnRyYW4uaCBiL2djYy9mb3J0cmFu L2dmb3J0cmFuLmgKaW5kZXggYmRiNGIwZjZhYTUuLjM3ZWIwMzliNmQ0IDEwMDY0NAotLS0g YS9nY2MvZm9ydHJhbi9nZm9ydHJhbi5oCisrKyBiL2djYy9mb3J0cmFuL2dmb3J0cmFuLmgK QEAgLTM4NTIsNiArMzg1Miw3IEBAIGJvb2wgZ2ZjX3BhcnNlX2ZpbGUgKHZvaWQpOwogdm9p ZCBnZmNfZ2xvYmFsX3VzZWQgKGdmY19nc3ltYm9sICosIGxvY3VzICopOwogZ2ZjX25hbWVz cGFjZSogZ2ZjX2J1aWxkX2Jsb2NrX25zIChnZmNfbmFtZXNwYWNlICopOwogZ2ZjX3N0YXRl bWVudCBtYXRjaF9vbXBfZGlyZWN0aXZlICh2b2lkKTsKK2Jvb2wgaXNfb21wX2RlY2xhcmF0 aXZlX3N0bXQgKGdmY19zdGF0ZW1lbnQpOwogCiAvKiBkZXBlbmRlbmN5LmNjICovCiBpbnQg Z2ZjX2RlcF9jb21wYXJlX2Z1bmN0aW9ucyAoZ2ZjX2V4cHIgKiwgZ2ZjX2V4cHIgKiwgYm9v bCk7CmRpZmYgLS1naXQgYS9nY2MvZm9ydHJhbi9vcGVubXAuY2MgYi9nY2MvZm9ydHJhbi9v cGVubXAuY2MKaW5kZXggNWU4N2UxOGNlMGQuLjAwNzE0ODQ4MTdkIDEwMDY0NAotLS0gYS9n Y2MvZm9ydHJhbi9vcGVubXAuY2MKKysrIGIvZ2NjL2ZvcnRyYW4vb3Blbm1wLmNjCkBAIC01 MTUxLDYgKzUxNTEsOSBAQCBtYXRjaF9vbXBfbWV0YWRpcmVjdGl2ZSAoYm9vbCBiZWdpbl9w KQogICAgICAgZ2ZjX3N0YXRlbWVudCBkaXJlY3RpdmUgPSBtYXRjaF9vbXBfZGlyZWN0aXZl ICgpOwogICAgICAgZ2ZjX21hdGNoaW5nX29tcF9jb250ZXh0X3NlbGVjdG9yID0gZmFsc2U7 CiAKKyAgICAgIGlmIChpc19vbXBfZGVjbGFyYXRpdmVfc3RtdCAoZGlyZWN0aXZlKSkKKwlz b3JyeSAoImRlY2xhcmF0aXZlIGRpcmVjdGl2ZSB2YXJpYW50cyBhcmUgbm90IHN1cHBvcnRl ZCIpOworCiAgICAgICBpZiAoZ2ZjX2Vycm9yX2ZsYWdfdGVzdCAoKSkKIAl7CiAJICBnZmNf Y3VycmVudF9sb2N1cyA9IG9sZF9sb2M7CmRpZmYgLS1naXQgYS9nY2MvZm9ydHJhbi9wYXJz ZS5jYyBiL2djYy9mb3J0cmFuL3BhcnNlLmNjCmluZGV4IGNkMTgzMTU2OTdlLi5jYjhhY2Iz YzY4ZiAxMDA2NDQKLS0tIGEvZ2NjL2ZvcnRyYW4vcGFyc2UuY2MKKysrIGIvZ2NjL2ZvcnRy YW4vcGFyc2UuY2MKQEAgLTU4NDEsNyArNTg0MSw4IEBAIHBhcnNlX29tcF9tZXRhZGlyZWN0 aXZlX2JvZHkgKGdmY19zdGF0ZW1lbnQgb21wX3N0KQogCiAgICAgICBnZmNfaW5fbWV0YWRp cmVjdGl2ZV9ib2R5ID0gb2xkX2luX21ldGFkaXJlY3RpdmVfYm9keTsKIAotICAgICAgKmNs YXVzZS0+Y29kZSA9ICpnZmNfc3RhdGVfc3RhY2stPmhlYWQ7CisgICAgICBpZiAoZ2ZjX3N0 YXRlX3N0YWNrLT5oZWFkKQorCSpjbGF1c2UtPmNvZGUgPSAqZ2ZjX3N0YXRlX3N0YWNrLT5o ZWFkOwogICAgICAgcG9wX3N0YXRlICgpOwogCiAgICAgICBnZmNfY29tbWl0X3N5bWJvbHMg KCk7CkBAIC03MDgxLDMgKzcwODIsMTYgQEAgaXNfb2FjYyAoZ2ZjX3N0YXRlX2RhdGEgKnNk KQogICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIH0KKworLyogUmV0dXJuIHRydWUgaWYg U1QgaXMgYSBkZWNsYXJhdGl2ZSBPcGVuTVAgc3RhdGVtZW50LiAgKi8KK2Jvb2wKK2lzX29t cF9kZWNsYXJhdGl2ZV9zdG10IChnZmNfc3RhdGVtZW50IHN0KQoreworICBzd2l0Y2ggKHN0 KQorICAgIHsKKyAgICAgIGNhc2Vfb21wX2RlY2w6CisJcmV0dXJuIHRydWU7CisgICAgICBk ZWZhdWx0OgorCXJldHVybiBmYWxzZTsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9nY2MvdGVz dHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAvbWV0YWRpcmVjdGl2ZS0yLmY5MCBiL2djYy90ZXN0 c3VpdGUvZ2ZvcnRyYW4uZGcvZ29tcC9tZXRhZGlyZWN0aXZlLTIuZjkwCmluZGV4IDA2YzMy NDU4OWQwLi5jZGQ1ZTg1MDY4ZSAxMDA2NDQKLS0tIGEvZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJh bi5kZy9nb21wL21ldGFkaXJlY3RpdmUtMi5mOTAKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nZm9y dHJhbi5kZy9nb21wL21ldGFkaXJlY3RpdmUtMi5mOTAKQEAgLTQzLDcgKzQzLDcgQEAgcHJv Z3JhbSBtYWluCiAgICAgZW5kIGRvCiAgICEkb21wIGVuZCBtZXRhZGlyZWN0aXZlCiAgIAot ICAhIFRlc3QgbGFiZWxzIGluIHRoZSBib2R5CisgICEgVGVzdCBsYWJlbHMgaW4gdGhlIGJv ZHkuCiAgICEkb21wIGJlZ2luIG1ldGFkaXJlY3RpdmUgJgogICAhJG9tcCYJd2hlbiAoZGV2 aWNlPXthcmNoKCJudnB0eCIpfTogcGFyYWxsZWwgZG8pICYKICAgISRvbXAmCXdoZW4gKGRl dmljZT17YXJjaCgiZ2NuIil9OiBwYXJhbGxlbCkKQEAgLTU2LDQgKzU2LDcgQEAgcHJvZ3Jh bSBtYWluCiAyMCAgICBjb250aW51ZQogICAgIGVuZCBkbwogICAhJG9tcCBlbmQgbWV0YWRp cmVjdGl2ZQorCisgICEgVGVzdCBlbXB0eSBtZXRhZGlyZWN0aXZlLgorICAhJG9tcCBtZXRh ZGlyZWN0aXZlCiBlbmQgcHJvZ3JhbQotLSAKMi4yNS4xCgo= --------------dMsKB0JS0etDQ9gZ8GcLzXA8--