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 55C983857C66; Fri, 20 Oct 2023 14:02:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 55C983857C66 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 55C983857C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=68.232.137.180 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697810567; cv=none; b=Ty2rUit3q27OG0H06iHc1Dh518B/pJ7JmO1wiY4gPyQOdmdMAmeuDFuU07n2SZF9G12BhJ29eTXq0sp6D38r6mKGa9wADkOcLb4cnfATEIfSdtw7n1s2ZC9myr6BNIzOzlrX6HTay8rPH3yH16PwsNTpsB6O1zmj5J2p69Cyhgo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697810567; c=relaxed/simple; bh=7MvVGjg3rpBnVRU86IyOTrUJItBft+ASGU/VuZ8bPUE=; h=Message-ID:Date:MIME-Version:To:From:Subject; b=rMQvWVUXv3Yl/M7S0Hb9De6EjYPs7WewI3p8KR5zQIZsQ1Fx7N87bvcLdslkInIjblo3yGHSnWfD0j8Xb20FDXR5B703kE6ytG2BFxX9HHxsPsR7oAh6J6P1aYoZIpZJ9HNt511gZaTEqTmorgxNS6+yACgPZei/TV+60KZWiAM= ARC-Authentication-Results: i=1; server2.sourceware.org X-CSE-ConnectionGUID: aV5F1YVFTpaVHZNFqpHhmA== X-CSE-MsgGUID: naa7PE+XT0edJodKIsQ9lg== X-IronPort-AV: E=Sophos;i="6.03,239,1694764800"; d="scan'208,223";a="20242193" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 20 Oct 2023 06:02:44 -0800 IronPort-SDR: ZMYpaqJaRp7GcEYg1yBRCm7O0rp4FZWFiyFGDQYkfRIXOp0jzXEBpxp9KOlDzIFZfzWsVTqc8W hBqY2Px3tcEmxPMmr1n20awCD4A/ukmnwViaDiqke9q/gjECkqdBHMhZhDis6ZAtQtd9j3bYK+ pbldlPRCc/KmACVBrPOSE5EIs5snebW84DDfQWrUOd1+byUUXLtkNEpneIua+EcxZDqLFtDuiZ 9nDNhPrUXMRTWVd7zgeT61Zv+sBQicYwrnDJ33FMSsJ8on8VTDxc2dXsdTP3LHz9rv0DXE36BU pwk= Content-Type: multipart/mixed; boundary="------------PPEZ8dcnmQgKA0pZZ5PXcYiW" Message-ID: <6fc6a877-2dc7-4551-b141-fd117c66ecfa@codesourcery.com> Date: Fri, 20 Oct 2023 16:02:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-GB, fr To: , From: Paul-Antoine Arras Subject: [PATCH] Fortran: Fix incompatible types between INTEGER(8) and TYPE(c_ptr) X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) To svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) X-Spam-Status: No, score=-12.0 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: --------------PPEZ8dcnmQgKA0pZZ5PXcYiW Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit Hi all, The attached patch fixes a bug that causes valid OpenMP declare variant directive and functions to be rejected with the following error (see testcase): c_ptr.f90:41:37: 41 | !$omp declare variant(foo_variant) & | 1 Error: variant ‘foo_variant’ and base ‘foo’ at (1) have incompatible types: Type mismatch in argument 'c_bv' (INTEGER(8)/TYPE(c_ptr)) The fix consists in special-casing this situation in gfc_compare_types(). OK for mainline? Thanks, -- PA --------------PPEZ8dcnmQgKA0pZZ5PXcYiW Content-Type: text/x-patch; charset="UTF-8"; name="0001-Fortran-Fix-incompatible-types-between-INTEGER-8-and.patch" Content-Disposition: attachment; filename*0="0001-Fortran-Fix-incompatible-types-between-INTEGER-8-and.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA4ZTVmYTQ4Mjg2NzhhMTM4OGU3NTc5NWRlMmExZjI1M2Q5ZjBlYzk1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsLUFudG9pbmUgQXJyYXMgPHBhQGNvZGVzb3Vy Y2VyeS5jb20+CkRhdGU6IEZyaSwgMjAgT2N0IDIwMjMgMTI6NDI6NDkgKzAyMDAKU3ViamVj dDogW1BBVENIXSBGb3J0cmFuOiBGaXggaW5jb21wYXRpYmxlIHR5cGVzIGJldHdlZW4gSU5U RUdFUig4KSBhbmQKIFRZUEUoY19wdHIpCgpJbiB0aGUgY29udGV4dCBvZiBhbiBPcGVuTVAg ZGVjbGFyZSB2YXJpYW50IGRpcmVjdGl2ZSwgYXJndW1lbnRzIG9mIHR5cGUgQ19QVFIKYXJl IHNvbWV0aW1lcyByZWNvZ25pc2VkIGFzIENfUFRSIGluIHRoZSBiYXNlIGZ1bmN0aW9uIGFu ZCBhcyBJTlRFR0VSKDgpIGluIHRoZQp2YXJpYW50IC0gb3IgdGhlIG90aGVyIHdheSBhcm91 bmQsIGRlcGVuZGluZyBvbiB0aGUgcGFyc2luZyBvcmRlci4KVGhpcyBwYXRjaCBwcmV2ZW50 cyBzdWNoIHNpdHVhdGlvbiBmcm9tIHR1cm5pbmcgaW50byBhIGNvbXBpbGUgZXJyb3IuCgoy MDIzLTEwLTIwICBQYXVsLUFudG9pbmUgQXJyYXMgIDxwYUBjb2Rlc291cmNlcnkuY29tPgoJ ICAgIFRvYmlhcyBCdXJudXMgIDx0b2JpYXNAY29kZXNvdXJjZXJ5LmNvbT4KCmdjYy9mb3J0 cmFuL0NoYW5nZUxvZzoKCgkqIGludGVyZmFjZS5jYyAoZ2ZjX2NvbXBhcmVfdHlwZXMpOiBS ZXR1cm4gdHJ1ZSBpbiB0aGlzIHNpdHVhdGlvbi4KCmdjYy90ZXN0c3VpdGUvQ2hhbmdlTG9n OgoKCSogZ2ZvcnRyYW4uZGcvY19wdHJfdGVzdHNfMjAuZjkwOiBOZXcgdGVzdC4KLS0tCiBn Y2MvZm9ydHJhbi9DaGFuZ2VMb2cub21wICAgICAgICAgICAgICAgICAgICB8ICA1ICsrCiBn Y2MvZm9ydHJhbi9pbnRlcmZhY2UuY2MgICAgICAgICAgICAgICAgICAgICB8IDE3ICsrKy0t LQogZ2NjL3Rlc3RzdWl0ZS9DaGFuZ2VMb2cub21wICAgICAgICAgICAgICAgICAgfCAgNCAr KwogZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9jX3B0cl90ZXN0c18yMC5mOTAgfCA1NiAr KysrKysrKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCA3NiBpbnNlcnRpb25zKCsp LCA2IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGdjYy90ZXN0c3VpdGUvZ2Zv cnRyYW4uZGcvY19wdHJfdGVzdHNfMjAuZjkwCgpkaWZmIC0tZ2l0IGEvZ2NjL2ZvcnRyYW4v Q2hhbmdlTG9nLm9tcCBiL2djYy9mb3J0cmFuL0NoYW5nZUxvZy5vbXAKaW5kZXggNjJhMzM0 NzVlZTUuLjI5OTIyM2NlYWE3IDEwMDY0NAotLS0gYS9nY2MvZm9ydHJhbi9DaGFuZ2VMb2cu b21wCisrKyBiL2djYy9mb3J0cmFuL0NoYW5nZUxvZy5vbXAKQEAgLTEsMyArMSw4IEBACisy MDIzLTEwLTIwICBQYXVsLUFudG9pbmUgQXJyYXMgIDxwYUBjb2Rlc291cmNlcnkuY29tPgor CSAgICBUb2JpYXMgQnVybnVzICA8dG9iaWFzQGNvZGVzb3VyY2VyeS5jb20+CisKKwkqIGlu dGVyZmFjZS5jYyAoZ2ZjX2NvbXBhcmVfdHlwZXMpOiBSZXR1cm4gdHJ1ZSBpbiB0aGlzIHNp dHVhdGlvbi4KKwogMjAyMy0wOS0xOSAgVG9iaWFzIEJ1cm51cyAgPHRvYmlhc0Bjb2Rlc291 cmNlcnkuY29tPgogCiAJQmFja3BvcnRlZCBmcm9tIG1hc3RlcjoKZGlmZiAtLWdpdCBhL2dj Yy9mb3J0cmFuL2ludGVyZmFjZS5jYyBiL2djYy9mb3J0cmFuL2ludGVyZmFjZS5jYwppbmRl eCBlOTg0M2U5NTQ5Yy4uOGJkMzVmZDZkMjIgMTAwNjQ0Ci0tLSBhL2djYy9mb3J0cmFuL2lu dGVyZmFjZS5jYworKysgYi9nY2MvZm9ydHJhbi9pbnRlcmZhY2UuY2MKQEAgLTcwNSwxMiAr NzA1LDE3IEBAIGdmY19jb21wYXJlX3R5cGVzIChnZmNfdHlwZXNwZWMgKnRzMSwgZ2ZjX3R5 cGVzcGVjICp0czIpCiAKICAgLyogU3BlY2lhbCBjYXNlIGZvciBvdXIgQyBpbnRlcm9wIHR5 cGVzLiAgRklYTUU6IFRoZXJlIHNob3VsZCBiZSBhCiAgICAgIGJldHRlciB3YXkgb2YgZG9p bmcgdGhpcy4gIFdoZW4gSVNPIEMgYmluZGluZyBpcyBjbGVhcmVkIHVwLAotICAgICB0aGlz IGNhbiBwcm9iYWJseSBiZSByZW1vdmVkLiAgU2VlIFBSIDU3MDQ4LiAgKi8KLQotICBpZiAo KCh0czEtPnR5cGUgPT0gQlRfSU5URUdFUiAmJiB0czItPnR5cGUgPT0gQlRfREVSSVZFRCkK LSAgICAgICB8fCAodHMxLT50eXBlID09IEJUX0RFUklWRUQgJiYgdHMyLT50eXBlID09IEJU X0lOVEVHRVIpKQotICAgICAgJiYgdHMxLT51LmRlcml2ZWQgJiYgdHMyLT51LmRlcml2ZWQK LSAgICAgICYmIHRzMS0+dS5kZXJpdmVkID09IHRzMi0+dS5kZXJpdmVkKQorICAgICB0aGlz IGNhbiBwcm9iYWJseSBiZSByZW1vdmVkLiAgU2VlIFBSIDU3MDQ4LgorICAgICBOb3RlIHRo YXQgdGhpcyBkb2VzIG5vdCBkaXN0aW5ndWlzaCBiZXR3ZWVuIGNfcHRyIGFuZCBjX2Z1bnB0 ci4gICovCisKKyAgaWYgKCh0czEtPnR5cGUgPT0gQlRfSU5URUdFUiAmJiB0czItPnR5cGUg PT0gQlRfREVSSVZFRAorICAgICAgICYmIHRzMS0+ZjkwX3R5cGUgPT0gQlRfVk9JRAorICAg ICAgICYmIHRzMi0+dS5kZXJpdmVkLT50cy5pc19pc29fYworICAgICAgICYmIHRzMi0+dS5k ZXJpdmVkLT50cy51LmRlcml2ZWQtPnRzLmY5MF90eXBlID09IEJUX1ZPSUQpCisgICAgICB8 fCAodHMyLT50eXBlID09IEJUX0lOVEVHRVIgJiYgdHMxLT50eXBlID09IEJUX0RFUklWRUQK KwkgICYmIHRzMi0+ZjkwX3R5cGUgPT0gQlRfVk9JRAorCSAgJiYgdHMxLT51LmRlcml2ZWQt PnRzLmlzX2lzb19jCisJICAmJiB0czEtPnUuZGVyaXZlZC0+dHMudS5kZXJpdmVkLT50cy5m OTBfdHlwZSA9PSBCVF9WT0lEKSkKICAgICByZXR1cm4gdHJ1ZTsKIAogICAvKiBUaGUgX2Rh dGEgY29tcG9uZW50IGlzIG5vdCBhbHdheXMgcHJlc2VudCwgdGhlcmVmb3JlIGNoZWNrIGZv ciBpdHMKZGlmZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvQ2hhbmdlTG9nLm9tcCBiL2djYy90 ZXN0c3VpdGUvQ2hhbmdlTG9nLm9tcAppbmRleCBlOWY0ZDFjNjNlNi4uMWZjOWIwNjA2ZGMg MTAwNjQ0Ci0tLSBhL2djYy90ZXN0c3VpdGUvQ2hhbmdlTG9nLm9tcAorKysgYi9nY2MvdGVz dHN1aXRlL0NoYW5nZUxvZy5vbXAKQEAgLTEsMyArMSw3IEBACisyMDIzLTEwLTIwICBQYXVs LUFudG9pbmUgQXJyYXMgIDxwYUBjb2Rlc291cmNlcnkuY29tPgorCisJKiBnZm9ydHJhbi5k Zy9jX3B0cl90ZXN0c18yMC5mOTA6IE5ldyB0ZXN0LgorCiAyMDIzLTA5LTIwICBUb2JpYXMg QnVybnVzICA8dG9iaWFzQGNvZGVzb3VyY2VyeS5jb20+CiAKIAlCYWNrcG9ydGVkIGZyb20g bWFzdGVyOgpkaWZmIC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9jX3B0cl90 ZXN0c18yMC5mOTAgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2NfcHRyX3Rlc3RzXzIw LmY5MApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uNzc3MTgxY2Vj ZTAKLS0tIC9kZXYvbnVsbAorKysgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2NfcHRy X3Rlc3RzXzIwLmY5MApAQCAtMCwwICsxLDU2IEBACishIHsgZGctZG8gY29tcGlsZSB9Cish CishIFRoaXMgZmFpbGVkIHRvIGNvbXBpbGUgdGhlIGRlY2xhcmUgdmFyaWFudCBkaXJlY3Rp dmUgZHVlIHRvIHRoZSBDX1BUUiAKKyEgYXJndW1lbnRzIHRvIGZvbyBiZWluZyByZWNvZ25p c2VkIGFzIElOVEVHRVIoOCkKKworcHJvZ3JhbSBhZGp1c3RfYXJncworICB1c2UgaXNvX2Nf YmluZGluZywgb25seTogY19sb2MKKyAgaW1wbGljaXQgbm9uZQorCisgIGludGVnZXIsIHBh cmFtZXRlciA6OiBOID0gMTAyNAorICByZWFsLCBhbGxvY2F0YWJsZSwgdGFyZ2V0IDo6IGF2 KDopLCBidig6KSwgY3YoOikKKworICBjYWxsIGZvbyhjX2xvYyhidiksIGNfbG9jKGF2KSwg TikKKworICAhJG9tcCB0YXJnZXQgZGF0YSBtYXAodG86IGF2KDpOKSkgbWFwKGZyb206IGN2 KDpOKSkKKyAgICAgICEkb21wIHBhcmFsbGVsCisgICAgICBjYWxsIGZvbyhjX2xvYyhjdiks IGNfbG9jKGF2KSwgTikKKyAgICAgICEkb21wIGVuZCBwYXJhbGxlbAorICAhJG9tcCBlbmQg dGFyZ2V0IGRhdGEKKyAgICAKK2NvbnRhaW5zCisgIHN1YnJvdXRpbmUgZm9vX3ZhcmlhbnQo Y19kX2J2LCBjX2RfYXYsIG4pCisgICAgdXNlIGlzb19jX2JpbmRpbmcsIG9ubHk6IGNfcHRy LCBjX2ZfcG9pbnRlcgorICAgIHR5cGUoY19wdHIpLCBpbnRlbnQoaW4pIDo6IGNfZF9idiwg Y19kX2F2CisgICAgaW50ZWdlciwgaW50ZW50KGluKSA6OiBuCisgICAgcmVhbCwgcG9pbnRl ciA6OiBmX2RfYnYoOikKKyAgICByZWFsLCBwb2ludGVyIDo6IGZfZF9hdig6KQorICAgIGlu dGVnZXIgOjogaQorICAKKyAgICBjYWxsIGNfZl9wb2ludGVyKGNfZF9idiwgZl9kX2J2LCBb bl0pCisgICAgY2FsbCBjX2ZfcG9pbnRlcihjX2RfYXYsIGZfZF9hdiwgW25dKQorICAgICEk b21wIHRhcmdldCB0ZWFtcyBsb29wIGlzX2RldmljZV9wdHIoZl9kX2J2LCBmX2RfYXYpCisg ICAgZG8gaSA9IDEsIG4KKyAgICAgIGZfZF9idihpKSA9IGZfZF9hdihpKSAqIGkKKyAgICBl bmQgZG8KKyAgZW5kIHN1YnJvdXRpbmUKKyAgCisgIAorICBzdWJyb3V0aW5lIGZvbyhjX2J2 LCBjX2F2LCBuKQorICAgIHVzZSBpc29fY19iaW5kaW5nLCBvbmx5OiBjX3B0ciwgY19mX3Bv aW50ZXIKKyAgICB0eXBlKGNfcHRyKSwgaW50ZW50KGluKSA6OiBjX2J2LCBjX2F2CisgICAg aW50ZWdlciwgaW50ZW50KGluKSA6OiBuCisgICAgcmVhbCwgcG9pbnRlciA6OiBmX2J2KDop CisgICAgcmVhbCwgcG9pbnRlciA6OiBmX2F2KDopCisgICAgaW50ZWdlciA6OiBpCisgICAg ISRvbXAgZGVjbGFyZSB2YXJpYW50KGZvb192YXJpYW50KSAgICAgICAgICAmCisgICAgISRv bXAgICAgICAgICBtYXRjaChjb25zdHJ1Y3Q9e3BhcmFsbGVsfSkgICAgICAgCisgIAorICAg IGNhbGwgY19mX3BvaW50ZXIoY19idiwgZl9idiwgW25dKQorICAgIGNhbGwgY19mX3BvaW50 ZXIoY19hdiwgZl9hdiwgW25dKQorICAgICEkb21wIHBhcmFsbGVsIGxvb3AKKyAgICBkbyBp ID0gMSwgbgorICAgICAgZl9idihpKSA9IGZfYXYoaSkgKiBpCisgICAgZW5kIGRvCisgIGVu ZCBzdWJyb3V0aW5lCitlbmQgcHJvZ3JhbQotLSAKMi40Mi4wCgo= --------------PPEZ8dcnmQgKA0pZZ5PXcYiW--