From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 6677F3856969; Thu, 27 Jul 2023 16:37:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6677F3856969 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="6.01,235,1684828800"; d="diff'?scan'208";a="12913505" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 27 Jul 2023 08:37:07 -0800 IronPort-SDR: ITJZB5FO48Av3iF5IGXPPtQTcXL17Pe4PrHETZCzu83By6BMhfBJxri+ZzStOTrsCiiZ5j3Euz n+Rdx5fAUpfJvFf520oEATo98Nd+pLD675j1kKGHlij7SGJzQ98sJ/rGuJGeo7/2/mMZkuLSAW 0U6ohFmjJfmcqMAGZll9JjMxu+npoJerD47JGsJxyapiFuTfIcSll/T4RHCN8r2B+HJYITdPfs dddAaPa+5z7DG26aQVJDS8TZArssorrL7MNdavO2VbDrSIEzV2qJAy0lP1wP0sSMlYYorQzdOk WXc= Content-Type: multipart/mixed; boundary="------------03bmaVDj3sZSdYkJd8I6xq2C" Message-ID: <447c2f24-912a-cfa7-5256-f5f560ed15f7@codesourcery.com> Date: Thu, 27 Jul 2023 18:36:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 Subject: [committed] OpenMP/Fortran: Extend reject code between target + teams [PR71065, PR110725] (was: Re: [patch] OpenMP/Fortran: Reject declarations between target + teams (was: [Patch] OpenMP/Fortran: Reject not strictly nested target -> teams [PR110725, PR71065])) Content-Language: en-US From: Tobias Burnus To: gcc-patches CC: fortran , Jakub Jelinek References: <8b5edd17-db3e-d4d7-121e-de8550fa9dbc@codesourcery.com> In-Reply-To: <8b5edd17-db3e-d4d7-121e-de8550fa9dbc@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-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-10.6 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,URIBL_BLACK 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: --------------03bmaVDj3sZSdYkJd8I6xq2C Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable Yet another omission, the flag was not properly set for deeply buried 'omp teams' as I stopped too early when walking up the stack. Now fixed by commit r14-2826-g081e25d3cfd86c * * * This was found when 'repairing' the feature on the OG13 (devel/omp/gcc-13) branch for metadirectives, cf. the second attached patch, applied after cherry-picking the mainline patch. Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --------------03bmaVDj3sZSdYkJd8I6xq2C Content-Type: text/x-patch; charset="UTF-8"; name="committed.diff" Content-Disposition: attachment; filename="committed.diff" Content-Transfer-Encoding: base64 Y29tbWl0IDA4MWUyNWQzY2ZkODZjNDA5NDk5OWRlZDBiYmU5OWI5MTc2MjAxM2MKQXV0aG9y OiBUb2JpYXMgQnVybnVzIDx0b2JpYXNAY29kZXNvdXJjZXJ5LmNvbT4KRGF0ZTogICBUaHUg SnVsIDI3IDE4OjE0OjExIDIwMjMgKzAyMDAKCiAgICBPcGVuTVAvRm9ydHJhbjogRXh0ZW5k IHJlamVjdCBjb2RlIGJldHdlZW4gdGFyZ2V0ICsgdGVhbXMgW1BSNzEwNjUsIFBSMTEwNzI1 XQogICAgCiAgICBUaGUgcHJldmlvdXMgdmVyc2lvbiBmYWlsZWQgdG8gZGlhZ25vc2Ugd2hl biB0aGUgJ3RlYW1zJyB3YXMgbmVzdGVkCiAgICBtb3JlIGRlZXBseSBpbnNpZGUgdGhlIHRh cmdldCByZWdpb24sIGUuZy4gaW5zaWRlIGEgRE8gb3Igc29tZQogICAgYmxvY2sgb3Igc3Ry dWN0dXJlZCBibG9jay4KICAgIAogICAgICAgICAgICAgICAgUFIgZm9ydHJhbi8xMTA3MjUK ICAgICAgICAgICAgICAgIFBSIG1pZGRsZS1lbmQvNzEwNjUKICAgIAogICAgZ2NjL2ZvcnRy YW4vQ2hhbmdlTG9nOgogICAgCiAgICAgICAgICAgICogb3Blbm1wLmNjIChyZXNvbHZlX29t cF90YXJnZXQpOiBNaW5vciBjbGVhbnVwLgogICAgICAgICAgICAqIHBhcnNlLmNjIChkZWNv ZGVfb21wX2RpcmVjdGl2ZSk6IEZpbmQgVEFSR0VUIHN0YXRlbWVudAogICAgICAgICAgICBh bHNvIGhpZ2hlciBpbiB0aGUgc3RhY2suCiAgICAKICAgIGdjYy90ZXN0c3VpdGUvQ2hhbmdl TG9nOgogICAgCiAgICAgICAgICAgICogZ2ZvcnRyYW4uZGcvZ29tcC90ZWFtcy02LmY5MDog RXh0ZW5kLgoKZGlmZiAtLWdpdCBhL2djYy9mb3J0cmFuL29wZW5tcC5jYyBiL2djYy9mb3J0 cmFuL29wZW5tcC5jYwppbmRleCA1MmVlYWYyZDRkYS4uMjk1MmNkMzAwYWMgMTAwNjQ0Ci0t LSBhL2djYy9mb3J0cmFuL29wZW5tcC5jYworKysgYi9nY2MvZm9ydHJhbi9vcGVubXAuY2MK QEAgLTEwNjY2LDE1ICsxMDY2NiwxNCBAQCByZXNvbHZlX29tcF90YXJnZXQgKGdmY19jb2Rl ICpjb2RlKQogCiAgIGlmICghY29kZS0+ZXh0Lm9tcF9jbGF1c2VzLT5jb250YWluc190ZWFt c19jb25zdHJ1Y3QpCiAgICAgcmV0dXJuOworICBnZmNfY29kZSAqYyA9IGNvZGUtPmJsb2Nr LT5uZXh0OwogICBpZiAoY29kZS0+ZXh0Lm9tcF9jbGF1c2VzLT50YXJnZXRfZmlyc3Rfc3Rf aXNfdGVhbXMKLSAgICAgICYmICgoR0ZDX0lTX1RFQU1TX0NPTlNUUlVDVCAoY29kZS0+Ymxv Y2stPm5leHQtPm9wKQotCSAgICYmIGNvZGUtPmJsb2NrLT5uZXh0LT5uZXh0ID09IE5VTEwp Ci0JICB8fCAoY29kZS0+YmxvY2stPm5leHQtPm9wID09IEVYRUNfQkxPQ0sKLQkgICAgICAm JiBjb2RlLT5ibG9jay0+bmV4dC0+bmV4dAotCSAgICAgICYmIEdGQ19JU19URUFNU19DT05T VFJVQ1QgKGNvZGUtPmJsb2NrLT5uZXh0LT5uZXh0LT5vcCkKLQkgICAgICAmJiBjb2RlLT5i bG9jay0+bmV4dC0+bmV4dC0+bmV4dCA9PSBOVUxMKSkpCisgICAgICAmJiAoKEdGQ19JU19U RUFNU19DT05TVFJVQ1QgKGMtPm9wKSAmJiBjLT5uZXh0ID09IE5VTEwpCisJICB8fCAoYy0+ b3AgPT0gRVhFQ19CTE9DSworCSAgICAgICYmIGMtPm5leHQKKwkgICAgICAmJiBHRkNfSVNf VEVBTVNfQ09OU1RSVUNUIChjLT5uZXh0LT5vcCkKKwkgICAgICAmJiBjLT5uZXh0LT5uZXh0 ID09IE5VTEwpKSkKICAgICByZXR1cm47Ci0gIGdmY19jb2RlICpjID0gY29kZS0+YmxvY2st Pm5leHQ7CiAgIHdoaWxlIChjICYmICFHRkNfSVNfVEVBTVNfQ09OU1RSVUNUIChjLT5vcCkp CiAgICAgYyA9IGMtPm5leHQ7CiAgIGlmIChjKQpkaWZmIC0tZ2l0IGEvZ2NjL2ZvcnRyYW4v cGFyc2UuY2MgYi9nY2MvZm9ydHJhbi9wYXJzZS5jYwppbmRleCBhYTZiYjY2M2RlZi4uZTc5 NzQwMmI1OWYgMTAwNjQ0Ci0tLSBhL2djYy9mb3J0cmFuL3BhcnNlLmNjCisrKyBiL2djYy9m b3J0cmFuL3BhcnNlLmNjCkBAIC0xMzE4LDMyICsxMzE4LDI3IEBAIGRlY29kZV9vbXBfZGly ZWN0aXZlICh2b2lkKQogICAgIGNhc2UgU1RfT01QX1RFQU1TX0RJU1RSSUJVVEVfUEFSQUxM RUxfRE86CiAgICAgY2FzZSBTVF9PTVBfVEVBTVNfRElTVFJJQlVURV9QQVJBTExFTF9ET19T SU1EOgogICAgIGNhc2UgU1RfT01QX1RFQU1TX0xPT1A6Ci0gICAgICBpZiAoZ2ZjX3N0YXRl X3N0YWNrLT5wcmV2aW91cyAmJiBnZmNfc3RhdGVfc3RhY2stPnByZXZpb3VzLT50YWlsKQot CXsKLQkgIGdmY19zdGF0ZV9kYXRhICpzdGsgPSBnZmNfc3RhdGVfc3RhY2s7Ci0JICBkbyB7 Ci0JICAgICAgIHN0ayA9IHN0ay0+cHJldmlvdXM7Ci0JICAgICB9IHdoaWxlIChzdGsgJiYg c3RrLT50YWlsICYmIHN0ay0+dGFpbC0+b3AgPT0gRVhFQ19CTE9DSyk7Ci0JICBpZiAoc3Rr ICYmIHN0ay0+dGFpbCkKLQkgICAgc3dpdGNoIChzdGstPnRhaWwtPm9wKQotCSAgICAgIHsK LQkgICAgICBjYXNlIEVYRUNfT01QX1RBUkdFVDoKLQkgICAgICBjYXNlIEVYRUNfT01QX1RB UkdFVF9URUFNU19ESVNUUklCVVRFOgotCSAgICAgIGNhc2UgRVhFQ19PTVBfVEFSR0VUX1RF QU1TX0RJU1RSSUJVVEVfU0lNRDoKLQkgICAgICBjYXNlIEVYRUNfT01QX1RBUkdFVF9URUFN U19ESVNUUklCVVRFX1BBUkFMTEVMX0RPOgotCSAgICAgIGNhc2UgRVhFQ19PTVBfVEFSR0VU X1RFQU1TX0RJU1RSSUJVVEVfUEFSQUxMRUxfRE9fU0lNRDoKLQkgICAgICBjYXNlIEVYRUNf T01QX1RBUkdFVF9URUFNU19MT09QOgotCSAgICAgIGNhc2UgRVhFQ19PTVBfVEFSR0VUX1BB UkFMTEVMOgotCSAgICAgIGNhc2UgRVhFQ19PTVBfVEFSR0VUX1BBUkFMTEVMX0RPOgotCSAg ICAgIGNhc2UgRVhFQ19PTVBfVEFSR0VUX1BBUkFMTEVMX0RPX1NJTUQ6Ci0JICAgICAgY2Fz ZSBFWEVDX09NUF9UQVJHRVRfUEFSQUxMRUxfTE9PUDoKLQkgICAgICBjYXNlIEVYRUNfT01Q X1RBUkdFVF9TSU1EOgotCQlzdGstPnRhaWwtPmV4dC5vbXBfY2xhdXNlcy0+Y29udGFpbnNf dGVhbXNfY29uc3RydWN0ID0gMTsKLQkJYnJlYWs7Ci0JICBkZWZhdWx0OgotCSAgICBicmVh azsKLQkgIH0KLQl9CisgICAgICBmb3IgKGdmY19zdGF0ZV9kYXRhICpzdGsgPSBnZmNfc3Rh dGVfc3RhY2stPnByZXZpb3VzOyBzdGs7CisJICAgc3RrID0gc3RrLT5wcmV2aW91cykKKwlp ZiAoc3RrICYmIHN0ay0+dGFpbCkKKwkgIHN3aXRjaCAoc3RrLT50YWlsLT5vcCkKKwkgICAg eworCSAgICBjYXNlIEVYRUNfT01QX1RBUkdFVDoKKwkgICAgY2FzZSBFWEVDX09NUF9UQVJH RVRfVEVBTVNfRElTVFJJQlVURToKKwkgICAgY2FzZSBFWEVDX09NUF9UQVJHRVRfVEVBTVNf RElTVFJJQlVURV9TSU1EOgorCSAgICBjYXNlIEVYRUNfT01QX1RBUkdFVF9URUFNU19ESVNU UklCVVRFX1BBUkFMTEVMX0RPOgorCSAgICBjYXNlIEVYRUNfT01QX1RBUkdFVF9URUFNU19E SVNUUklCVVRFX1BBUkFMTEVMX0RPX1NJTUQ6CisJICAgIGNhc2UgRVhFQ19PTVBfVEFSR0VU X1RFQU1TX0xPT1A6CisJICAgIGNhc2UgRVhFQ19PTVBfVEFSR0VUX1BBUkFMTEVMOgorCSAg ICBjYXNlIEVYRUNfT01QX1RBUkdFVF9QQVJBTExFTF9ETzoKKwkgICAgY2FzZSBFWEVDX09N UF9UQVJHRVRfUEFSQUxMRUxfRE9fU0lNRDoKKwkgICAgY2FzZSBFWEVDX09NUF9UQVJHRVRf UEFSQUxMRUxfTE9PUDoKKwkgICAgY2FzZSBFWEVDX09NUF9UQVJHRVRfU0lNRDoKKwkgICAg ICBzdGstPnRhaWwtPmV4dC5vbXBfY2xhdXNlcy0+Y29udGFpbnNfdGVhbXNfY29uc3RydWN0 ID0gMTsKKwkgICAgICBicmVhazsKKwkgICAgZGVmYXVsdDoKKwkgICAgICBicmVhazsKKwkg ICAgfQogICAgICAgYnJlYWs7CiAgICAgY2FzZSBTVF9PTVBfRVJST1I6CiAgICAgICBpZiAo bmV3X3N0LmV4dC5vbXBfY2xhdXNlcy0+YXQgIT0gT01QX0FUX0VYRUNVVElPTikKZGlmZiAt LWdpdCBhL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvZ29tcC90ZWFtcy02LmY5MCBiL2dj Yy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvZ29tcC90ZWFtcy02LmY5MAppbmRleCBiZTQ1M2Yy N2Y0MC4uMGJkNzczNWU3MzggMTAwNjQ0Ci0tLSBhL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4u ZGcvZ29tcC90ZWFtcy02LmY5MAorKysgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dv bXAvdGVhbXMtNi5mOTAKQEAgLTM3LDYgKzM3LDE2IEBAIGVuZCBibG9jawogICBpID0gNQog ICAhJG9tcCBlbmQgdGVhbXMKICEkb21wIGVuZCB0YXJnZXQKKworCishJG9tcCB0YXJnZXQg ICEgeyBkZy1lcnJvciAiT01QIFRBUkdFVCByZWdpb24gYXQgLjEuIHdpdGggYSBuZXN0ZWQg VEVBTVMgbWF5IG5vdCBjb250YWluIGFueSBvdGhlciBzdGF0ZW1lbnQsIGRlY2xhcmF0aW9u IG9yIGRpcmVjdGl2ZSBvdXRzaWRlIG9mIHRoZSBzaW5nbGUgVEVBTVMgY29uc3RydWN0IiB9 CitibG9jaworICBkbyBpID0gNSwgOAorICAgICEkb21wIHRlYW1zCisgICAgYmxvY2s7IGVu ZCBibG9jaworICBlbmQgZG8KK2VuZCBibG9jaworCiBlbmQKIAogCg== --------------03bmaVDj3sZSdYkJd8I6xq2C Content-Type: text/x-patch; charset="UTF-8"; name="og13.diff" Content-Disposition: attachment; filename="og13.diff" Content-Transfer-Encoding: base64 Y29tbWl0IGVhZTQ1N2Q5YWE2Y2NhZDE2OTI3NTliZmZlZThmYTNmNmM5MmEzYTAKQXV0aG9y OiBUb2JpYXMgQnVybnVzIDx0b2JpYXNAY29kZXNvdXJjZXJ5LmNvbT4KRGF0ZTogICBUaHUg SnVsIDI3IDE4OjMwOjIwIDIwMjMgKzAyMDAKCiAgICBPcGVuTVAvRm9ydHJhbjogRml4IHRh cmdldCArIHRlYW1zIGRpYWdub3N0aWMgd2l0aCBtZXRhZGlyZWN0aXZlcwogICAgCiAgICBn Y2MvZm9ydHJhbi9DaGFuZ2VMb2c6CiAgICAKICAgICAgICAgICAgKiBnZm9ydHJhbi5oIChn ZmNfb21wX2NsYXVzZXMpOiBSZW5hbWUgdGFyZ2V0X2ZpcnN0X3N0X2lzX3RlYW1zCiAgICAg ICAgICAgIHRvIHRhcmdldF9maXJzdF9zdF9pc190ZWFtc19vcl9tZXRhLgogICAgICAgICAg ICAqIHBhcnNlLmNjIChwYXJzZV9vbXBfc3RydWN0dXJlZF9ibG9jayk6IEhhbmRsZSBtZXRh ZGlyZWN0aXZlcwogICAgICAgICAgICBmb3IgdGFyZ2V0X2ZpcnN0X3N0X2lzX3RlYW1zLgog ICAgICAgICAgICAqIG9wZW5tcC5jYyAocmVzb2x2ZV9vbXBfdGFyZ2V0KTogTGlrZXdpc2Ug dG8gZml4IHRhcmdldCt0ZWFtcwogICAgICAgICAgICBkaWFnbm9zdGljIHdpdGggbWV0YWRp cmVjdGl2ZXMuCiAgICAKICAgIGxpYmdvbXAvQ2hhbmdlTG9nOgogICAgCiAgICAgICAgICAg ICogdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9tZXRhZGlyZWN0aXZlLTEuZjkwOiBFeHRl bmQuCiAgICAgICAgICAgICogdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9tZXRhZGlyZWN0 aXZlLTYuZjkwOiBOZXcgdGVzdC4KLS0tCiBnY2MvZm9ydHJhbi9DaGFuZ2VMb2cub21wICAg ICAgICAgICAgICAgICAgICAgICAgICB8ICA5ICsrKysKIGdjYy9mb3J0cmFuL2dmb3J0cmFu LmggICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIGdjYy9mb3J0cmFuL29w ZW5tcC5jYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMzUgKysrKysrKysrKy0t LQogZ2NjL2ZvcnRyYW4vcGFyc2UuY2MgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg fCAgNCArLQogbGliZ29tcC9DaGFuZ2VMb2cub21wICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgNSArKwogLi4uL3Rlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vbWV0YWRpcmVj dGl2ZS0xLmY5MCAgfCAyOCArKysrKysrKysrKwogLi4uL3Rlc3RzdWl0ZS9saWJnb21wLmZv cnRyYW4vbWV0YWRpcmVjdGl2ZS02LmY5MCAgfCA1OCArKysrKysrKysrKysrKysrKysrKysr CiA3IGZpbGVzIGNoYW5nZWQsIDEzMiBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2djYy9mb3J0cmFuL0NoYW5nZUxvZy5vbXAgYi9nY2MvZm9ydHJhbi9D aGFuZ2VMb2cub21wCmluZGV4IGMxOTdmNzdmMWY5Li4yMzdlOWViZWJhMiAxMDA2NDQKLS0t IGEvZ2NjL2ZvcnRyYW4vQ2hhbmdlTG9nLm9tcAorKysgYi9nY2MvZm9ydHJhbi9DaGFuZ2VM b2cub21wCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjMtMDctMjcgIFRvYmlhcyBCdXJudXMgIDx0 b2JpYXNAY29kZXNvdXJjZXJ5LmNvbT4KKworCSogZ2ZvcnRyYW4uaCAoZ2ZjX29tcF9jbGF1 c2VzKTogUmVuYW1lIHRhcmdldF9maXJzdF9zdF9pc190ZWFtcworCXRvIHRhcmdldF9maXJz dF9zdF9pc190ZWFtc19vcl9tZXRhLgorCSogcGFyc2UuY2MgKHBhcnNlX29tcF9zdHJ1Y3R1 cmVkX2Jsb2NrKTogSGFuZGxlIG1ldGFkaXJlY3RpdmVzCisJZm9yIHRhcmdldF9maXJzdF9z dF9pc190ZWFtcy4KKwkqIG9wZW5tcC5jYyAocmVzb2x2ZV9vbXBfdGFyZ2V0KTogTGlrZXdp c2UgdG8gZml4IHRhcmdldCt0ZWFtcworCWRpYWdub3N0aWMgd2l0aCBtZXRhZGlyZWN0aXZl cy4KKwogMjAyMy0wNy0yNyAgVG9iaWFzIEJ1cm51cyAgPHRvYmlhc0Bjb2Rlc291cmNlcnku Y29tPgogCiAJQmFja3BvcnRlZCBmcm9tIG1hc3RlcjoKZGlmZiAtLWdpdCBhL2djYy9mb3J0 cmFuL2dmb3J0cmFuLmggYi9nY2MvZm9ydHJhbi9nZm9ydHJhbi5oCmluZGV4IDJjZjhhMGUw YzM5Li4wZTdlODBlNGJmMSAxMDA2NDQKLS0tIGEvZ2NjL2ZvcnRyYW4vZ2ZvcnRyYW4uaAor KysgYi9nY2MvZm9ydHJhbi9nZm9ydHJhbi5oCkBAIC0xNTg4LDcgKzE1ODgsNyBAQCB0eXBl ZGVmIHN0cnVjdCBnZmNfb21wX2NsYXVzZXMKICAgdW5zaWduZWQgb3JkZXJfdW5jb25zdHJh aW5lZDoxLCBvcmRlcl9yZXByb2R1Y2libGU6MSwgY2FwdHVyZToxOwogICB1bnNpZ25lZCBn cmFpbnNpemVfc3RyaWN0OjEsIG51bV90YXNrc19zdHJpY3Q6MSwgY29tcGFyZToxLCB3ZWFr OjE7CiAgIHVuc2lnbmVkIG5vbl9yZWN0YW5ndWxhcjoxLCBvcmRlcl9jb25jdXJyZW50OjE7 Ci0gIHVuc2lnbmVkIGNvbnRhaW5zX3RlYW1zX2NvbnN0cnVjdDoxLCB0YXJnZXRfZmlyc3Rf c3RfaXNfdGVhbXM6MTsKKyAgdW5zaWduZWQgY29udGFpbnNfdGVhbXNfY29uc3RydWN0OjEs IHRhcmdldF9maXJzdF9zdF9pc190ZWFtc19vcl9tZXRhOjE7CiAgIHVuc2lnbmVkIHVucm9s bF9mdWxsOjEsIHVucm9sbF9ub25lOjEsIHVucm9sbF9wYXJ0aWFsOjE7CiAgIHVuc2lnbmVk IHVucm9sbF9wYXJ0aWFsX2ZhY3RvcjsKICAgRU5VTV9CSVRGSUVMRCAoZ2ZjX29tcF9zY2hl ZF9raW5kKSBzY2hlZF9raW5kOjM7CmRpZmYgLS1naXQgYS9nY2MvZm9ydHJhbi9vcGVubXAu Y2MgYi9nY2MvZm9ydHJhbi9vcGVubXAuY2MKaW5kZXggMThhNGEzM2ZlYWEuLmRlY2NiMTRh NTI1IDEwMDY0NAotLS0gYS9nY2MvZm9ydHJhbi9vcGVubXAuY2MKKysrIGIvZ2NjL2ZvcnRy YW4vb3Blbm1wLmNjCkBAIC0xMjI1MiwxMyArMTIyNTIsMzQgQEAgcmVzb2x2ZV9vbXBfdGFy Z2V0IChnZmNfY29kZSAqY29kZSkKICAgaWYgKCFjb2RlLT5leHQub21wX2NsYXVzZXMtPmNv bnRhaW5zX3RlYW1zX2NvbnN0cnVjdCkKICAgICByZXR1cm47CiAgIGdmY19jb2RlICpjID0g Y29kZS0+YmxvY2stPm5leHQ7Ci0gIGlmIChjb2RlLT5leHQub21wX2NsYXVzZXMtPnRhcmdl dF9maXJzdF9zdF9pc190ZWFtcwotICAgICAgJiYgKChHRkNfSVNfVEVBTVNfQ09OU1RSVUNU IChjLT5vcCkgJiYgYy0+bmV4dCA9PSBOVUxMKQotCSAgfHwgKGMtPm9wID09IEVYRUNfQkxP Q0sKLQkgICAgICAmJiBjLT5uZXh0Ci0JICAgICAgJiYgR0ZDX0lTX1RFQU1TX0NPTlNUUlVD VCAoYy0+bmV4dC0+b3ApCi0JICAgICAgJiYgYy0+bmV4dC0+bmV4dCA9PSBOVUxMKSkpCi0g ICAgcmV0dXJuOworICBpZiAoYy0+b3AgPT0gRVhFQ19CTE9DSykKKyAgICBjID0gYy0+bmV4 dDsKKyAgaWYgKGNvZGUtPmV4dC5vbXBfY2xhdXNlcy0+dGFyZ2V0X2ZpcnN0X3N0X2lzX3Rl YW1zX29yX21ldGEpCisgICAgeworICAgICAgaWYgKGMtPm9wID09IEVYRUNfT01QX01FVEFE SVJFQ1RJVkUpCisJeworCSAgc3RydWN0IGdmY19vbXBfbWV0YWRpcmVjdGl2ZV9jbGF1c2Ug Km1jCisJICAgID0gYy0+ZXh0Lm9tcF9tZXRhZGlyZWN0aXZlX2NsYXVzZXM7CisJICAvKiBB bGwgbWMtPihuZXh0Li4uLT4pY29kZSBzaG91bGQgYmUgaWRlbnRpY2FsIHdpdGggcmVnYXJk cworCSAgICAgdG8gdGhlIGRpYWdub3N0aWMgYmVsb3cuICAqLworCSAgZG8KKwkgICAgewor CSAgICAgIGlmIChtYy0+c3RtdCAhPSBTVF9OT05FCisJCSAgJiYgR0ZDX0lTX1RFQU1TX0NP TlNUUlVDVCAobWMtPmNvZGUtPm9wKSkKKwkJeworCQkgIGlmIChjLT5uZXh0ID09IE5VTEwg JiYgbWMtPmNvZGUtPm5leHQgPT0gTlVMTCkKKwkJICAgIHJldHVybjsKKwkJICBjID0gbWMt PmNvZGU7CisJCSAgYnJlYWs7CisJCX0KKwkgICAgICBtYyA9IG1jLT5uZXh0OworCSAgICB9 CisJICB3aGlsZSAobWMpOworCX0KKyAgICAgIGVsc2UgaWYgKEdGQ19JU19URUFNU19DT05T VFJVQ1QgKGMtPm9wKSAmJiBjLT5uZXh0ID09IE5VTEwpCisJcmV0dXJuOworICAgIH0KKwog ICB3aGlsZSAoYyAmJiAhR0ZDX0lTX1RFQU1TX0NPTlNUUlVDVCAoYy0+b3ApKQogICAgIGMg PSBjLT5uZXh0OwogICBpZiAoYykKZGlmZiAtLWdpdCBhL2djYy9mb3J0cmFuL3BhcnNlLmNj IGIvZ2NjL2ZvcnRyYW4vcGFyc2UuY2MKaW5kZXggMjA3MGE4YTdkZWUuLmVmZWRkZTFkODRi IDEwMDY0NAotLS0gYS9nY2MvZm9ydHJhbi9wYXJzZS5jYworKysgYi9nY2MvZm9ydHJhbi9w YXJzZS5jYwpAQCAtNTgzMyw5ICs1ODMzLDExIEBAIHBhcnNlX29tcF9zdHJ1Y3R1cmVkX2Js b2NrIChnZmNfc3RhdGVtZW50IG9tcF9zdCwgYm9vbCB3b3Jrc2hhcmVfc3RtdHNfb25seSkK ICAgICAgIGNhc2UgU1RfT01QX1RFQU1TX0RJU1RSSUJVVEVfUEFSQUxMRUxfRE86CiAgICAg ICBjYXNlIFNUX09NUF9URUFNU19ESVNUUklCVVRFX1BBUkFMTEVMX0RPX1NJTUQ6CiAgICAg ICBjYXNlIFNUX09NUF9URUFNU19MT09QOgorICAgICAgY2FzZSBTVF9PTVBfTUVUQURJUkVD VElWRToKKyAgICAgIGNhc2UgU1RfT01QX0JFR0lOX01FVEFESVJFQ1RJVkU6CiAJewogCSAg Z2ZjX3N0YXRlX2RhdGEgKnN0ayA9IGdmY19zdGF0ZV9zdGFjay0+cHJldmlvdXM7Ci0JICBz dGstPnRhaWwtPmV4dC5vbXBfY2xhdXNlcy0+dGFyZ2V0X2ZpcnN0X3N0X2lzX3RlYW1zID0g dHJ1ZTsKKwkgIHN0ay0+dGFpbC0+ZXh0Lm9tcF9jbGF1c2VzLT50YXJnZXRfZmlyc3Rfc3Rf aXNfdGVhbXNfb3JfbWV0YSA9IHRydWU7CiAJICBicmVhazsKIAl9CiAgICAgICBkZWZhdWx0 OgpkaWZmIC0tZ2l0IGEvbGliZ29tcC9DaGFuZ2VMb2cub21wIGIvbGliZ29tcC9DaGFuZ2VM b2cub21wCmluZGV4IGY4MzcwMGYxYzAwLi45ZjhlM2VjOTQ3ZCAxMDA2NDQKLS0tIGEvbGli Z29tcC9DaGFuZ2VMb2cub21wCisrKyBiL2xpYmdvbXAvQ2hhbmdlTG9nLm9tcApAQCAtMSwz ICsxLDggQEAKKzIwMjMtMDctMjcgIFRvYmlhcyBCdXJudXMgIDx0b2JpYXNAY29kZXNvdXJj ZXJ5LmNvbT4KKworCSogdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9tZXRhZGlyZWN0aXZl LTEuZjkwOiBFeHRlbmQuCisJKiB0ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFuL21ldGFkaXJl Y3RpdmUtNi5mOTA6IE5ldyB0ZXN0LgorCiAyMDIzLTA3LTI2ICBUb2JpYXMgQnVybnVzICA8 dG9iaWFzQGNvZGVzb3VyY2VyeS5jb20+CiAKIAlCYWNrcG9ydGVkIGZyb20gbWFzdGVyOgpk aWZmIC0tZ2l0IGEvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFuL21ldGFkaXJl Y3RpdmUtMS5mOTAgYi9saWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vbWV0YWRp cmVjdGl2ZS0xLmY5MAppbmRleCA5ZjZhMDc0NTllMC4uN2IzZTA5ZjdjMmEgMTAwNjQ0Ci0t LSBhL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9tZXRhZGlyZWN0aXZlLTEu ZjkwCisrKyBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9tZXRhZGlyZWN0 aXZlLTEuZjkwCkBAIC0xNywxNyArMTcsNDUgQEAgcHJvZ3JhbSB0ZXN0CiAgIGRvIGkgPSAx LCBOCiAgICAgaWYgKHooaSkgLm5lLiB4KGkpICogeShpKSkgc3RvcCAxCiAgIGVuZCBkbwor CisgICEgLS0tLS0KKyAgZG8gaSA9IDEsIE4KKyAgICB4KGkpID0gaTsKKyAgICB5KGkpID0g LWk7CisgIGVuZCBkbworCisgIGNhbGwgZyAoeCwgeSwgeikKKworICBkbyBpID0gMSwgTgor ICAgIGlmICh6KGkpIC5uZS4geChpKSAqIHkoaSkpIHN0b3AgMQorICBlbmQgZG8KKwogY29u dGFpbnMKICAgc3Vicm91dGluZSBmICh4LCB5LCB6KQogICAgIGludGVnZXIgOjogeChOKSwg eShOKSwgeihOKQogCiAgICAgISRvbXAgdGFyZ2V0IG1hcCAodG86IHgsIHkpIG1hcChmcm9t OiB6KQorICAgICAgYmxvY2sKKyAgICAgICEkb21wIG1ldGFkaXJlY3RpdmUgJgorCQkhJG9t cCYgd2hlbihkZXZpY2U9e2FyY2goIm52cHR4Iil9OiB0ZWFtcyBsb29wKSAmCisJCSEkb21w JiBkZWZhdWx0KHBhcmFsbGVsIGxvb3ApCisJZG8gaSA9IDEsIE4KKwkgIHooaSkgPSB4KGkp ICogeShpKQorCWVuZGRvCisgICAgICBlbmQgYmxvY2sKKyAgZW5kIHN1YnJvdXRpbmUKKyAg c3Vicm91dGluZSBnICh4LCB5LCB6KQorICAgIGludGVnZXIgOjogeChOKSwgeShOKSwgeihO KQorCisgICAgISRvbXAgdGFyZ2V0IG1hcCAodG86IHgsIHkpIG1hcChmcm9tOiB6KQorICAg IGJsb2NrCiAgICAgICAhJG9tcCBtZXRhZGlyZWN0aXZlICYKIAkJISRvbXAmIHdoZW4oZGV2 aWNlPXthcmNoKCJudnB0eCIpfTogdGVhbXMgbG9vcCkgJgogCQkhJG9tcCYgZGVmYXVsdChw YXJhbGxlbCBsb29wKQogCWRvIGkgPSAxLCBOCiAJICB6KGkpID0geChpKSAqIHkoaSkKIAll bmRkbworICAgIGVuZCBibG9jawogICAgICEkb21wIGVuZCB0YXJnZXQKICAgZW5kIHN1YnJv dXRpbmUKIGVuZCBwcm9ncmFtCmRpZmYgLS1naXQgYS9saWJnb21wL3Rlc3RzdWl0ZS9saWJn b21wLmZvcnRyYW4vbWV0YWRpcmVjdGl2ZS02LmY5MCBiL2xpYmdvbXAvdGVzdHN1aXRlL2xp YmdvbXAuZm9ydHJhbi9tZXRhZGlyZWN0aXZlLTYuZjkwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwLi40MzZmZGJhZGUyZgotLS0gL2Rldi9udWxsCisrKyBiL2xp YmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9tZXRhZGlyZWN0aXZlLTYuZjkwCkBA IC0wLDAgKzEsNTggQEAKKyEgeyBkZy1kbyBjb21waWxlIH0KKworcHJvZ3JhbSB0ZXN0Cisg IGltcGxpY2l0IG5vbmUKKworICBpbnRlZ2VyLCBwYXJhbWV0ZXIgOjogTiA9IDEwMAorICBp bnRlZ2VyIDo6IHgoTiksIHkoTiksIHooTikKKyAgaW50ZWdlciA6OiBpCisKK2NvbnRhaW5z CisgIHN1YnJvdXRpbmUgZiAoeCwgeSwgeikKKyAgICBpbnRlZ2VyIDo6IHgoTiksIHkoTiks IHooTikKKworICAgICEkb21wIHRhcmdldCBtYXAgKHRvOiB4LCB5KSBtYXAoZnJvbTogeikg ICEgeyBkZy1lcnJvciAiT01QIFRBUkdFVCByZWdpb24gYXQgLjEuIHdpdGggYSBuZXN0ZWQg VEVBTVMgYXQgLjIuIG1heSBub3QgY29udGFpbiBhbnkgb3RoZXIgc3RhdGVtZW50LCBkZWNs YXJhdGlvbiBvciBkaXJlY3RpdmUgb3V0c2lkZSBvZiB0aGUgc2luZ2xlIFRFQU1TIGNvbnN0 cnVjdCIgfQorICAgICAgYmxvY2sKKyAgICAgICEkb21wIG1ldGFkaXJlY3RpdmUgJgorCQkh JG9tcCYgd2hlbihkZXZpY2U9e2FyY2goIm52cHR4Iil9OiB0ZWFtcyBsb29wKSAmCisJCSEk b21wJiBkZWZhdWx0KHBhcmFsbGVsIGxvb3ApICAhIHsgZGctZXJyb3IgIlxcKDFcXCkiIH0K KyAhIEZJWE1FOiBUaGUgbGluZSBhYm92ZSBzaG91bGQgYmUgdGhlIHNhbWUgZXJyb3IgYXMg YWJvdmUgYnV0IHNvbWUgZmFpbHMgaGVyZSB3aXRoIC1mbm8tZGlhZ25vc3RpY3Mtc2hvdy1j YXJldAorICEgU2VlbXMgYXMgaWYgc29tZSBnY2MvdGVzdHN1aXRlLyBmaXggaXMgbWlzc2lu ZyBmb3IgbGliZ29tcC90ZXN0c3VpdGUKKwlkbyBpID0gMSwgTgorCSAgeihpKSA9IHgoaSkg KiB5KGkpCisJZW5kZG8KKyAgICAgICB6KE4pID0geihOKSArIDEgICEgPDw8IGludmFsaWQK KyAgICAgIGVuZCBibG9jaworICBlbmQgc3Vicm91dGluZQorCisgIHN1YnJvdXRpbmUgZjIg KHgsIHksIHopCisgICAgaW50ZWdlciA6OiB4KE4pLCB5KE4pLCB6KE4pCisKKyAgICAhJG9t cCB0YXJnZXQgbWFwICh0bzogeCwgeSkgbWFwKGZyb206IHopICAhIHsgZGctZXJyb3IgIk9N UCBUQVJHRVQgcmVnaW9uIGF0IC4xLiB3aXRoIGEgbmVzdGVkIFRFQU1TIG1heSBub3QgY29u dGFpbiBhbnkgb3RoZXIgc3RhdGVtZW50LCBkZWNsYXJhdGlvbiBvciBkaXJlY3RpdmUgb3V0 c2lkZSBvZiB0aGUgc2luZ2xlIFRFQU1TIGNvbnN0cnVjdCIgfQorICAgICAgYmxvY2sKKyAg ICAgIGludGVnZXIgOjogaSAhIDw8IGludmFsaWQKKyAgICAgICEkb21wIG1ldGFkaXJlY3Rp dmUgJgorCQkhJG9tcCYgd2hlbihkZXZpY2U9e2FyY2goIm52cHR4Iil9OiB0ZWFtcyBsb29w KSAmCisJCSEkb21wJiBkZWZhdWx0KHBhcmFsbGVsIGxvb3ApCisJZG8gaSA9IDEsIE4KKwkg IHooaSkgPSB4KGkpICogeShpKQorCWVuZGRvCisgICAgICBlbmQgYmxvY2sKKyAgZW5kIHN1 YnJvdXRpbmUKKyAgc3Vicm91dGluZSBnICh4LCB5LCB6KQorICAgIGludGVnZXIgOjogeChO KSwgeShOKSwgeihOKQorCisgICAgISRvbXAgdGFyZ2V0IG1hcCAodG86IHgsIHkpIG1hcChm cm9tOiB6KSAgISB7IGRnLWVycm9yICJPTVAgVEFSR0VUIHJlZ2lvbiBhdCAuMS4gd2l0aCBh IG5lc3RlZCBURUFNUyBtYXkgbm90IGNvbnRhaW4gYW55IG90aGVyIHN0YXRlbWVudCwgZGVj bGFyYXRpb24gb3IgZGlyZWN0aXZlIG91dHNpZGUgb2YgdGhlIHNpbmdsZSBURUFNUyBjb25z dHJ1Y3QiIH0KKyAgICBibG9jaworICAgICAgISRvbXAgbWV0YWRpcmVjdGl2ZSAmICAgISA8 PDw8IGludmFsaWQKKwkJISRvbXAmIHdoZW4oZGV2aWNlPXthcmNoKCJudnB0eCIpfTogZmx1 c2gpICYKKwkJISRvbXAmIGRlZmF1bHQobm90aGluZykKKyAgICAgICAhJG9tcCB0ZWFtcyBs b29wCisJZG8gaSA9IDEsIE4KKwkgIHooaSkgPSB4KGkpICogeShpKQorCWVuZGRvCisgICAg ZW5kIGJsb2NrCisgICAgISRvbXAgZW5kIHRhcmdldAorICBlbmQgc3Vicm91dGluZQorCitl bmQgcHJvZ3JhbQo= --------------03bmaVDj3sZSdYkJd8I6xq2C--