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 66736385842B; Sat, 26 Mar 2022 02:03:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 66736385842B 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="76224198" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 25 Mar 2022 18:03:13 -0800 IronPort-SDR: UuUJ9kAsgx3/n1cJ1uK4k+DaHwIXJ2Sk27JaPwv8V3/d05ThiJw/jw9oFgBQocev4Dmhmfdj// tJTicUViR9G0ghv3EXECxU+vO+neAHsW2IRIh+EUwFLsxgyUoQboBDsXeKKw8oasS1qie4pJ8a 7r5/WSZ1W79FMvPeJONTloS0yKJmWcahcz1cERgvd/QcK522anwePhylcmQfJYqNmJoCTy96bS GhPk9I2Nz6PWSW4COuvxxK8YqhoUC1HPXUg3FSm7cqxgBso52mj00hFaTcie5ixwlWZ+B8ocmG Oes= Content-Type: multipart/mixed; boundary="------------3dsYAoE3krVUjKuHnMljJ8sH" Message-ID: <24bde0e8-8da4-4d4f-30fd-9a9b5830b944@codesourcery.com> Date: Fri, 25 Mar 2022 20:03:09 -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: Add location info to OpenMP tree nodes X-ClientProxiedBy: svr-orw-mbx-11.mgc.mentorg.com (147.34.90.211) 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:03:17 -0000 --------------3dsYAoE3krVUjKuHnMljJ8sH Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit I've got another patch forthcoming (stage 1 material) that adds some new diagnostics for non-rectangular loops during gimplification of OMP nodes. When I was working on that, I discovered that the Fortran front end wasn't attaching location information to the tree nodes corresponding to the various OMP directives, so the new errors weren't coming out with location info either. I went through trans-openmp.cc and fixed all the places where make_node was being called to explicitly set the location. I don't have a test case specifically for this change, but my test cases for the new diagnostics in the non-rectangular loops patch do exercise it. Is this OK for trunk now, or for stage 1 when we get there? -Sandra --------------3dsYAoE3krVUjKuHnMljJ8sH Content-Type: text/x-patch; charset="UTF-8"; name="omp-location.patch" Content-Disposition: attachment; filename="omp-location.patch" Content-Transfer-Encoding: base64 Y29tbWl0IDRjNzQ1MDAzZDBiMzlkMGU5MjAzMmI2MjQyMWRmNDkyMDc1Mzc4M2EKQXV0aG9y OiBTYW5kcmEgTG9vc2Vtb3JlIDxzYW5kcmFAY29kZXNvdXJjZXJ5LmNvbT4KRGF0ZTogICBU aHUgTWFyIDI0IDIxOjAyOjM0IDIwMjIgLTA3MDAKCiAgICBGb3J0cmFuOiBBZGQgbG9jYXRp b24gaW5mbyB0byBPcGVuTVAgdHJlZSBub2RlcwogICAgCiAgICAJIGdjYy9mb3J0cmFuLwog ICAgCSAqIHRyYW5zLW9wZW5tcC5jYyAoZ2ZjX3RyYW5zX29tcF9jcml0aWNhbCk6IFNldCBs b2NhdGlvbiBvbiBPTVAKICAgIAkgdHJlZSBub2RlLgogICAgCSAoZ2ZjX3RyYW5zX29tcF9k byk6IExpa2V3aXNlLgogICAgCSAoZ2ZjX3RyYW5zX29tcF9tYXNrZWQpOiBMaWtld2lzZS4K ICAgIAkgKGdmY190cmFuc19vbXBfZG9fc2ltZCk6IExpa2V3aXNlLgogICAgCSAoZ2ZjX3Ry YW5zX29tcF9zY29wZSk6IExpa2V3aXNlLgogICAgCSAoZ2ZjX3RyYW5zX29tcF90YXNrZ3Jv dXApOiBMaWtld2lzZS4KICAgIAkgKGdmY190cmFuc19vbXBfdGFza3dhaXQpOiBMaWtld2lz ZS4KICAgIAkgKGdmY190cmFuc19vbXBfZGlzdHJpYnV0ZSk6IExpa2V3aXNlLgogICAgCSAo Z2ZjX3RyYW5zX29tcF90YXNrbG9vcCk6IExpa2V3aXNlLgogICAgCSAoZ2ZjX3RyYW5zX29t cF9tYXN0ZXJfbWFza2VkX3Rhc2tsb29wKTogTGlrZXdpc2UuCgpkaWZmIC0tZ2l0IGEvZ2Nj L2ZvcnRyYW4vdHJhbnMtb3Blbm1wLmNjIGIvZ2NjL2ZvcnRyYW4vdHJhbnMtb3Blbm1wLmNj CmluZGV4IDI1ZGRlODIuLmJhM2ZmNzEgMTAwNjQ0Ci0tLSBhL2djYy9mb3J0cmFuL3RyYW5z LW9wZW5tcC5jYworKysgYi9nY2MvZm9ydHJhbi90cmFucy1vcGVubXAuY2MKQEAgLTUwMTIs NiArNTAxMiw3IEBAIGdmY190cmFuc19vbXBfY3JpdGljYWwgKGdmY19jb2RlICpjb2RlKQog ICAgIG5hbWUgPSBnZXRfaWRlbnRpZmllciAoY29kZS0+ZXh0Lm9tcF9jbGF1c2VzLT5jcml0 aWNhbF9uYW1lKTsKICAgZ2ZjX3N0YXJ0X2Jsb2NrICgmYmxvY2spOwogICBzdG10ID0gbWFr ZV9ub2RlIChPTVBfQ1JJVElDQUwpOworICBTRVRfRVhQUl9MT0NBVElPTiAoc3RtdCwgZ2Zj X2dldF9sb2NhdGlvbiAoJmNvZGUtPmxvYykpOwogICBUUkVFX1RZUEUgKHN0bXQpID0gdm9p ZF90eXBlX25vZGU7CiAgIE9NUF9DUklUSUNBTF9CT0RZIChzdG10KSA9IGdmY190cmFuc19j b2RlIChjb2RlLT5ibG9jay0+bmV4dCk7CiAgIE9NUF9DUklUSUNBTF9OQU1FIChzdG10KSA9 IG5hbWU7CkBAIC01MDQ0LDYgKzUwNDUsNyBAQCBnZmNfdHJhbnNfb21wX2RvIChnZmNfY29k ZSAqY29kZSwgZ2ZjX2V4ZWNfb3Agb3AsIHN0bXRibG9ja190ICpwYmxvY2ssCiAgIHVuc2ln bmVkIGl4OwogICB2ZWM8dHJlZSwgdmFfaGVhcCwgdmxfZW1iZWQ+ICpzYXZlZF9kb2Fjcm9z c19zdGVwcyA9IGRvYWNyb3NzX3N0ZXBzOwogICBnZmNfZXhwcl9saXN0ICp0aWxlID0gZG9f Y2xhdXNlcyA/IGRvX2NsYXVzZXMtPnRpbGVfbGlzdCA6IGNsYXVzZXMtPnRpbGVfbGlzdDsK KyAgZ2ZjX2NvZGUgKm9yaWdfY29kZSA9IGNvZGU7CiAKICAgLyogQm90aCBjb2xsYXBzZWQg YW5kIHRpbGVkIGxvb3BzIGFyZSBsb3dlcmVkIHRoZSBzYW1lIHdheS4gIEluCiAgICAgIE9w ZW5BQ0MsIHRob3NlIGNsYXVzZXMgYXJlIG5vdCBjb21wYXRpYmxlLCBzbyBwcmlvcml0aXpl IHRoZSB0aWxlCkBAIC01Mzk4LDYgKzU0MDAsNyBAQCBnZmNfdHJhbnNfb21wX2RvIChnZmNf Y29kZSAqY29kZSwgZ2ZjX2V4ZWNfb3Agb3AsIHN0bXRibG9ja190ICpwYmxvY2ssCiAgICAg ZGVmYXVsdDogZ2NjX3VucmVhY2hhYmxlICgpOwogICAgIH0KIAorICBTRVRfRVhQUl9MT0NB VElPTiAoc3RtdCwgZ2ZjX2dldF9sb2NhdGlvbiAoJm9yaWdfY29kZS0+bG9jKSk7CiAgIFRS RUVfVFlQRSAoc3RtdCkgPSB2b2lkX3R5cGVfbm9kZTsKICAgT01QX0ZPUl9CT0RZIChzdG10 KSA9IGdmY19maW5pc2hfYmxvY2sgKCZib2R5KTsKICAgT01QX0ZPUl9DTEFVU0VTIChzdG10 KSA9IG9tcF9jbGF1c2VzOwpAQCAtNTY3MCw2ICs1NjczLDcgQEAgZ2ZjX3RyYW5zX29tcF9t YXNrZWQgKGdmY19jb2RlICpjb2RlLCBnZmNfb21wX2NsYXVzZXMgKmNsYXVzZXMpCiAgIGdm Y19zdGFydF9ibG9jayAoJmJsb2NrKTsKICAgdHJlZSBvbXBfY2xhdXNlcyA9IGdmY190cmFu c19vbXBfY2xhdXNlcyAoJmJsb2NrLCBjbGF1c2VzLCBjb2RlLT5sb2MpOwogICB0cmVlIHN0 bXQgPSBtYWtlX25vZGUgKE9NUF9NQVNLRUQpOworICBTRVRfRVhQUl9MT0NBVElPTiAoc3Rt dCwgZ2ZjX2dldF9sb2NhdGlvbiAoJmNvZGUtPmxvYykpOwogICBUUkVFX1RZUEUgKHN0bXQp ID0gdm9pZF90eXBlX25vZGU7CiAgIE9NUF9NQVNLRURfQk9EWSAoc3RtdCkgPSBib2R5Owog ICBPTVBfTUFTS0VEX0NMQVVTRVMgKHN0bXQpID0gb21wX2NsYXVzZXM7CkBAIC02NDQ0LDYg KzY0NDgsNyBAQCBnZmNfdHJhbnNfb21wX2RvX3NpbWQgKGdmY19jb2RlICpjb2RlLCBzdG10 YmxvY2tfdCAqcGJsb2NrLAogICBpZiAoZmxhZ19vcGVubXApCiAgICAgewogICAgICAgc3Rt dCA9IG1ha2Vfbm9kZSAoT01QX0ZPUik7CisgICAgICBTRVRfRVhQUl9MT0NBVElPTiAoc3Rt dCwgZ2ZjX2dldF9sb2NhdGlvbiAoJmNvZGUtPmxvYykpOwogICAgICAgVFJFRV9UWVBFIChz dG10KSA9IHZvaWRfdHlwZV9ub2RlOwogICAgICAgT01QX0ZPUl9CT0RZIChzdG10KSA9IGJv ZHk7CiAgICAgICBPTVBfRk9SX0NMQVVTRVMgKHN0bXQpID0gb21wX2RvX2NsYXVzZXM7CkBA IC02NjE2LDYgKzY2MjEsNyBAQCBnZmNfdHJhbnNfb21wX3Njb3BlIChnZmNfY29kZSAqY29k ZSkKICAgdHJlZSBvbXBfY2xhdXNlcyA9IGdmY190cmFuc19vbXBfY2xhdXNlcyAoJmJsb2Nr LCBjb2RlLT5leHQub21wX2NsYXVzZXMsCiAJCQkJCSAgICBjb2RlLT5sb2MpOwogICB0cmVl IHN0bXQgPSBtYWtlX25vZGUgKE9NUF9TQ09QRSk7CisgIFNFVF9FWFBSX0xPQ0FUSU9OIChz dG10LCBnZmNfZ2V0X2xvY2F0aW9uICgmY29kZS0+bG9jKSk7CiAgIFRSRUVfVFlQRSAoc3Rt dCkgPSB2b2lkX3R5cGVfbm9kZTsKICAgT01QX1NDT1BFX0JPRFkgKHN0bXQpID0gYm9keTsK ICAgT01QX1NDT1BFX0NMQVVTRVMgKHN0bXQpID0gb21wX2NsYXVzZXM7CkBAIC02NjkxLDYg KzY2OTcsNyBAQCBnZmNfdHJhbnNfb21wX3Rhc2tncm91cCAoZ2ZjX2NvZGUgKmNvZGUpCiAg IGdmY19zdGFydF9ibG9jayAoJmJsb2NrKTsKICAgdHJlZSBib2R5ID0gZ2ZjX3RyYW5zX2Nv ZGUgKGNvZGUtPmJsb2NrLT5uZXh0KTsKICAgdHJlZSBzdG10ID0gbWFrZV9ub2RlIChPTVBf VEFTS0dST1VQKTsKKyAgU0VUX0VYUFJfTE9DQVRJT04gKHN0bXQsIGdmY19nZXRfbG9jYXRp b24gKCZjb2RlLT5sb2MpKTsKICAgVFJFRV9UWVBFIChzdG10KSA9IHZvaWRfdHlwZV9ub2Rl OwogICBPTVBfVEFTS0dST1VQX0JPRFkgKHN0bXQpID0gYm9keTsKICAgT01QX1RBU0tHUk9V UF9DTEFVU0VTIChzdG10KSA9IGdmY190cmFuc19vbXBfY2xhdXNlcyAoJmJsb2NrLApAQCAt NjcxMSw2ICs2NzE4LDcgQEAgZ2ZjX3RyYW5zX29tcF90YXNrd2FpdCAoZ2ZjX2NvZGUgKmNv ZGUpCiAgIHN0bXRibG9ja190IGJsb2NrOwogICBnZmNfc3RhcnRfYmxvY2sgKCZibG9jayk7 CiAgIHRyZWUgc3RtdCA9IG1ha2Vfbm9kZSAoT01QX1RBU0spOworICBTRVRfRVhQUl9MT0NB VElPTiAoc3RtdCwgZ2ZjX2dldF9sb2NhdGlvbiAoJmNvZGUtPmxvYykpOwogICBUUkVFX1RZ UEUgKHN0bXQpID0gdm9pZF90eXBlX25vZGU7CiAgIE9NUF9UQVNLX0JPRFkgKHN0bXQpID0g TlVMTF9UUkVFOwogICBPTVBfVEFTS19DTEFVU0VTIChzdG10KSA9IGdmY190cmFuc19vbXBf Y2xhdXNlcyAoJmJsb2NrLApAQCAtNjc4OCw2ICs2Nzk2LDcgQEAgZ2ZjX3RyYW5zX29tcF9k aXN0cmlidXRlIChnZmNfY29kZSAqY29kZSwgZ2ZjX29tcF9jbGF1c2VzICpjbGF1c2VzYSkK ICAgaWYgKGZsYWdfb3Blbm1wKQogICAgIHsKICAgICAgIHRyZWUgZGlzdHJpYnV0ZSA9IG1h a2Vfbm9kZSAoT01QX0RJU1RSSUJVVEUpOworICAgICAgU0VUX0VYUFJfTE9DQVRJT04gKGRp c3RyaWJ1dGUsIGdmY19nZXRfbG9jYXRpb24gKCZjb2RlLT5sb2MpKTsKICAgICAgIFRSRUVf VFlQRSAoZGlzdHJpYnV0ZSkgPSB2b2lkX3R5cGVfbm9kZTsKICAgICAgIE9NUF9GT1JfQk9E WSAoZGlzdHJpYnV0ZSkgPSBzdG10OwogICAgICAgT01QX0ZPUl9DTEFVU0VTIChkaXN0cmli dXRlKSA9IG9tcF9jbGF1c2VzOwpAQCAtNzAwOCw2ICs3MDE3LDcgQEAgZ2ZjX3RyYW5zX29t cF90YXNrbG9vcCAoZ2ZjX2NvZGUgKmNvZGUsIGdmY19leGVjX29wIG9wKQogICBpZiAoZmxh Z19vcGVubXApCiAgICAgewogICAgICAgdHJlZSB0YXNrbG9vcCA9IG1ha2Vfbm9kZSAoT01Q X1RBU0tMT09QKTsKKyAgICAgIFNFVF9FWFBSX0xPQ0FUSU9OICh0YXNrbG9vcCwgZ2ZjX2dl dF9sb2NhdGlvbiAoJmNvZGUtPmxvYykpOwogICAgICAgVFJFRV9UWVBFICh0YXNrbG9vcCkg PSB2b2lkX3R5cGVfbm9kZTsKICAgICAgIE9NUF9GT1JfQk9EWSAodGFza2xvb3ApID0gc3Rt dDsKICAgICAgIE9NUF9GT1JfQ0xBVVNFUyAodGFza2xvb3ApID0gb21wX2NsYXVzZXM7CkBA IC03MDUzLDYgKzcwNjMsNyBAQCBnZmNfdHJhbnNfb21wX21hc3Rlcl9tYXNrZWRfdGFza2xv b3AgKGdmY19jb2RlICpjb2RlLCBnZmNfZXhlY19vcCBvcCkKIAkJCQkJICAgICZjbGF1c2Vz YVtHRkNfT01QX1NQTElUX01BU0tFRF0sCiAJCQkJCSAgICBjb2RlLT5sb2MpOwogICAgICAg dHJlZSBtc2sgPSBtYWtlX25vZGUgKE9NUF9NQVNLRUQpOworICAgICAgU0VUX0VYUFJfTE9D QVRJT04gKG1zaywgZ2ZjX2dldF9sb2NhdGlvbiAoJmNvZGUtPmxvYykpOwogICAgICAgVFJF RV9UWVBFIChtc2spID0gdm9pZF90eXBlX25vZGU7CiAgICAgICBPTVBfTUFTS0VEX0JPRFkg KG1zaykgPSBzdG10OwogICAgICAgT01QX01BU0tFRF9DTEFVU0VTIChtc2spID0gY2xhdXNl czsK --------------3dsYAoE3krVUjKuHnMljJ8sH--