From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 45854 invoked by alias); 19 May 2017 16:13:26 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 45822 invoked by uid 89); 19 May 2017 16:13:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.1 required=5.0 tests=BAYES_00,GIT_PATCH_2,GIT_PATCH_3,KAM_ASCII_DIVIDERS,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=benjamin, talks, brendan X-HELO: userp1040.oracle.com Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 19 May 2017 16:13:21 +0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v4JGDMRR030605 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 19 May 2017 16:13:22 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v4JGDLhA025144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 19 May 2017 16:13:22 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id v4JGDJPq021824 for ; Fri, 19 May 2017 16:13:20 GMT Received: from [192.168.1.4] (/79.46.216.225) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 19 May 2017 09:13:19 -0700 To: "gcc-patches@gcc.gnu.org" From: Paolo Carlini Subject: [C++ Patch] Replace a few more error + error with error + inform Message-ID: <8407427e-d71a-e7ab-80b4-c43241044918@oracle.com> Date: Fri, 19 May 2017 16:15:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------9190AFFC18A1DA5A2D32EA03" X-IsSubscribed: yes X-SW-Source: 2017-05/txt/msg01594.txt.bz2 This is a multi-part message in MIME format. --------------9190AFFC18A1DA5A2D32EA03 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 538 Hi, while looking into some bugs (eg, c++/71464) I noticed a few more of those consecutive errors, which I propose to adjust per the below patchlet. The second case in add_method is a bit tricky because in principle we'd really like to be more specific (eg, clang talks about constructors which cannot be redeclared, member functions which cannot be redeclared and many more) and avoid verbose diagnostic, but in the below I only try to avoid emitting error + error... Tested x86_64-linux. Thanks, Paolo. ///////////////////// --------------9190AFFC18A1DA5A2D32EA03 Content-Type: text/plain; charset=UTF-8; name="CL_error_inform_3" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="CL_error_inform_3" Content-length: 981 L2NwCjIwMTctMDUtMTkgIFBhb2xvIENhcmxpbmkgIDxwYW9sby5jYXJsaW5p QG9yYWNsZS5jb20+CgoJKiBjbGFzcy5jIChhZGRfbWV0aG9kKTogQ2hhbmdl IHBhaXIgb2YgZXJyb3JzIHRvIGVycm9yICsgaW5mb3JtLgoJKGhhbmRsZV91 c2luZ19kZWNsKTogTGlrZXdpc2UuCgovdGVzdHN1aXRlCjIwMTctMDUtMTkg IFBhb2xvIENhcmxpbmkgIDxwYW9sby5jYXJsaW5pQG9yYWNsZS5jb20+CgoJ KiBnKysuZGcvY3BwMHgvaW5oLWN0b3IzLkM6IEFkanVzdCBmb3IgZGctbWVz c2FnZSB2cyBkZy1lcnJvci4KCSogZysrLmRnL2RpYWdub3N0aWMvdmFyaWFk aWMxLkM6IExpa2V3aXNlLgoJKiBnKysuZGcvZ29tcC91ZHItMy5DOiBMaWtl d2lzZS4KCSogZysrLmRnL292ZXJsb2FkL2Vycm9yMS5DOiBMaWtld2lzZS4K CSogZysrLmRnL292ZXJsb2FkL2Vycm9yMi5DOiBMaWtld2lzZS4KCSogZysr LmRnL3RlbXBsYXRlL2R1cGxpY2F0ZTEuQzogTGlrZXdpc2UuCgkqIGcrKy5v bGQtZGVqYS9nKysuYmVuamFtaW4vd2FybjAyLkM6IExpa2V3aXNlLgoJKiBn Kysub2xkLWRlamEvZysrLmJyZW5kYW4vYXJtMi5DOiBMaWtld2lzZS4KCSog ZysrLm9sZC1kZWphL2crKy5vdGhlci9yZWRlY2wyLkM6IExpa2V3aXNlLgoJ KiBnKysub2xkLWRlamEvZysrLm90aGVyL3JlZGVjbDQuQzogTGlrZXdpc2Uu CgkqIGcrKy5vbGQtZGVqYS9nKysucHQvbWVtdGVtcDc4LkM6IExpa2V3aXNl Lgo= --------------9190AFFC18A1DA5A2D32EA03 Content-Type: text/plain; charset=UTF-8; name="patch_error_inform_3" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch_error_inform_3" Content-length: 14091 SW5kZXg6IGNwL2NsYXNzLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g Y3AvY2xhc3MuYwkocmV2aXNpb24gMjQ4MjQ1KQorKysgY3AvY2xhc3MuYwko d29ya2luZyBjb3B5KQpAQCAtMTIxMiwxMCArMTIxMiwxMSBAQCBhZGRfbWV0 aG9kICh0cmVlIHR5cGUsIHRyZWUgbWV0aG9kLCBib29sIHZpYV91c2luZwog CQkJY29udGludWU7CiAJCSAgICB9CiAJCSAgZXJyb3JfYXQgKERFQ0xfU09V UkNFX0xPQ0FUSU9OIChtZXRob2QpLAotCQkJICAgICIlcSNEIiwgbWV0aG9k KTsKLQkJICBlcnJvcl9hdCAoREVDTF9TT1VSQ0VfTE9DQVRJT04gKGZuKSwK LQkJCSAgICAiY29uZmxpY3RzIHdpdGggdmVyc2lvbiBpbmhlcml0ZWQgZnJv bSAlcVQiLAotCQkJICAgIGJhc2VmKTsKKwkJCSAgICAiJXEjRCBjb25mbGlj dHMgd2l0aCB2ZXJzaW9uIGluaGVyaXRlZCBmcm9tICVxVCIsCisJCQkgICAg bWV0aG9kLCBiYXNlZik7CisJCSAgaW5mb3JtIChERUNMX1NPVVJDRV9MT0NB VElPTiAoZm4pLAorCQkJICAidmVyc2lvbiBpbmhlcml0ZWQgZnJvbSAlcVQg ZGVjbGFyZWQgaGVyZSIsCisJCQkgIGJhc2VmKTsKIAkJfQogCSAgICAgIC8q IE90aGVyd2lzZSBkZWZlciB0byB0aGUgb3RoZXIgZnVuY3Rpb24uICAqLwog CSAgICAgIHJldHVybiBmYWxzZTsKQEAgLTEyMzMsOCArMTIzNCwxMCBAQCBh ZGRfbWV0aG9kICh0cmVlIHR5cGUsIHRyZWUgbWV0aG9kLCBib29sIHZpYV91 c2luZwogCSAgICB9CiAJICBlbHNlCiAJICAgIHsKLQkgICAgICBlcnJvciAo IiVxKyNEIGNhbm5vdCBiZSBvdmVybG9hZGVkIiwgbWV0aG9kKTsKLQkgICAg ICBlcnJvciAoIndpdGggJXErI0QiLCBmbik7CisJICAgICAgZXJyb3JfYXQg KERFQ0xfU09VUkNFX0xPQ0FUSU9OIChtZXRob2QpLAorCQkJIiVxI0QgY2Fu bm90IGJlIG92ZXJsb2FkZWQgd2l0aCAlcSNEIiwgbWV0aG9kLCBmbik7CisJ ICAgICAgaW5mb3JtIChERUNMX1NPVVJDRV9MT0NBVElPTiAoZm4pLAorCQkg ICAgICAicHJldmlvdXMgZGVjbGFyYXRpb24gJXEjRCIsIGZuKTsKIAkgICAg ICByZXR1cm4gZmFsc2U7CiAJICAgIH0KIAl9CkBAIC0xMzY2LDE2ICsxMzY5 LDIxIEBAIGhhbmRsZV91c2luZ19kZWNsICh0cmVlIHVzaW5nX2RlY2wsIHRy ZWUgdCkKIAkgICB0aGUgc2FtZSBuYW1lIGFscmVhZHkgcHJlc2VudCBpbiB0 aGUgY3VycmVudCBjbGFzcy4gICovOwogICAgICAgZWxzZQogCXsKLQkgIGVy cm9yICgiJXErRCBpbnZhbGlkIGluICVxI1QiLCB1c2luZ19kZWNsLCB0KTsK LQkgIGVycm9yICgiICBiZWNhdXNlIG9mIGxvY2FsIG1ldGhvZCAlcSsjRCB3 aXRoIHNhbWUgbmFtZSIsCi0JCSBvbGRfdmFsdWUpOworCSAgZXJyb3JfYXQg KERFQ0xfU09VUkNFX0xPQ0FUSU9OICh1c2luZ19kZWNsKSwgIiVxRCBpbnZh bGlkIGluICVxI1QgIgorCQkgICAgImJlY2F1c2Ugb2YgbG9jYWwgbWV0aG9k ICVxI0Qgd2l0aCBzYW1lIG5hbWUiLAorCQkgICAgdXNpbmdfZGVjbCwgdCwg b2xkX3ZhbHVlKTsKKwkgIGluZm9ybSAoREVDTF9TT1VSQ0VfTE9DQVRJT04g KG9sZF92YWx1ZSksCisJCSAgImxvY2FsIG1ldGhvZCAlcSNEIGRlY2xhcmVk IGhlcmUiLCBvbGRfdmFsdWUpOwogCSAgcmV0dXJuOwogCX0KICAgICB9CiAg IGVsc2UgaWYgKCFERUNMX0FSVElGSUNJQUwgKG9sZF92YWx1ZSkpCiAgICAg ewotICAgICAgZXJyb3IgKCIlcStEIGludmFsaWQgaW4gJXEjVCIsIHVzaW5n X2RlY2wsIHQpOwotICAgICAgZXJyb3IgKCIgIGJlY2F1c2Ugb2YgbG9jYWwg bWVtYmVyICVxKyNEIHdpdGggc2FtZSBuYW1lIiwgb2xkX3ZhbHVlKTsKKyAg ICAgIGVycm9yX2F0IChERUNMX1NPVVJDRV9MT0NBVElPTiAodXNpbmdfZGVj bCksICIlcUQgaW52YWxpZCBpbiAlcSNUICIKKwkJImJlY2F1c2Ugb2YgbG9j YWwgbWVtYmVyICVxI0Qgd2l0aCBzYW1lIG5hbWUiLAorCQl1c2luZ19kZWNs LCB0LCBvbGRfdmFsdWUpOworICAgICAgaW5mb3JtIChERUNMX1NPVVJDRV9M T0NBVElPTiAob2xkX3ZhbHVlKSwKKwkgICAgICAibG9jYWwgbWVtYmVyICVx I0QgZGVjbGFyZWQgaGVyZSIsIG9sZF92YWx1ZSk7CiAgICAgICByZXR1cm47 CiAgICAgfQogCkluZGV4OiB0ZXN0c3VpdGUvZysrLmRnL2NwcDB4L2luaC1j dG9yMy5DCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRlc3RzdWl0ZS9n KysuZGcvY3BwMHgvaW5oLWN0b3IzLkMJKHJldmlzaW9uIDI0ODI0NCkKKysr IHRlc3RzdWl0ZS9nKysuZGcvY3BwMHgvaW5oLWN0b3IzLkMJKHdvcmtpbmcg Y29weSkKQEAgLTgsNyArOCw3IEBAIHN0cnVjdCBCMiB7CiAgIEIyKGludCk7 CiB9Owogc3RydWN0IEQxIDogQjEsIEIyIHsKLSAgdXNpbmcgQjE6OkIxOwkJ CS8vIHsgZGctZXJyb3IgImluaGVyaXRlZCIgfQorICB1c2luZyBCMTo6QjE7 CQkJLy8geyBkZy1tZXNzYWdlICJkZWNsYXJlZCIgfQogICB1c2luZyBCMjo6 QjI7CQkJLy8geyBkZy1lcnJvciAiaW5oZXJpdGVkIiB9CiB9OwkJCSAgIC8v IGlsbC1mb3JtZWQ6IGF0dGVtcHRzIHRvIGRlY2xhcmUgRDEoaW50KSB0d2lj ZQogc3RydWN0IEQyIDogQjEsIEIyIHsKSW5kZXg6IHRlc3RzdWl0ZS9nKysu ZGcvZGlhZ25vc3RpYy92YXJpYWRpYzEuQwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSB0ZXN0c3VpdGUvZysrLmRnL2RpYWdub3N0aWMvdmFyaWFkaWMx LkMJKHJldmlzaW9uIDI0ODI0NCkKKysrIHRlc3RzdWl0ZS9nKysuZGcvZGlh Z25vc3RpYy92YXJpYWRpYzEuQwkod29ya2luZyBjb3B5KQpAQCAtNCw2ICs0 LDYgQEAKIHRlbXBsYXRlPGludCBOPiBzdHJ1Y3QgQiB7IH07CiB0ZW1wbGF0 ZTx0eXBlbmFtZS4uLiBUPiBzdHJ1Y3QgQQogewotICBCPHNpemVvZi4uLihU KT4gZigpOwkJLy8geyBkZy1lcnJvciAic2l6ZW9mXFwuXFwuXFwuIiB9Cisg IEI8c2l6ZW9mLi4uKFQpPiBmKCk7CQkvLyB7IGRnLW1lc3NhZ2UgInNpemVv ZlxcLlxcLlxcLiIgfQogICBCPDQyPiBmKCk7CQkJLy8geyBkZy1lcnJvciAi Y2Fubm90IGJlIG92ZXJsb2FkZWQiIH0KIH07CkluZGV4OiB0ZXN0c3VpdGUv ZysrLmRnL2dvbXAvdWRyLTMuQwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSB0ZXN0c3VpdGUvZysrLmRnL2dvbXAvdWRyLTMuQwkocmV2aXNpb24gMjQ4 MjQ0KQorKysgdGVzdHN1aXRlL2crKy5kZy9nb21wL3Vkci0zLkMJKHdvcmtp bmcgY29weSkKQEAgLTc3LDcgKzc3LDcgQEAgbmFtZXNwYWNlIE4yCiB7CiAg IHN0cnVjdCBVCiAgIHsKLSAgICAjcHJhZ21hIG9tcCBkZWNsYXJlIHJlZHVj dGlvbiAoYmFyOiBTOiBvbXBfb3V0LnMgKj0gb21wX2luLnMpCS8vIHsgZGct ZXJyb3IgIndpdGgiIH0KKyAgICAjcHJhZ21hIG9tcCBkZWNsYXJlIHJlZHVj dGlvbiAoYmFyOiBTOiBvbXBfb3V0LnMgKj0gb21wX2luLnMpCS8vIHsgZGct bWVzc2FnZSAicHJldmlvdXMiIH0KICAgICAjcHJhZ21hIG9tcCBkZWNsYXJl IHJlZHVjdGlvbiAoYmFyOiBTOiBvbXBfb3V0LnMgKz0gb21wX2luLnMpCS8v IHsgZGctZXJyb3IgImNhbm5vdCBiZSBvdmVybG9hZGVkIiB9CiAgIH07CiB9 CkBAIC0xMDksOSArMTA5LDkgQEAgbmFtZXNwYWNlIE40CiAgIHN0cnVjdCBV CiAgIHsKICAgICAjcHJhZ21hIG9tcCBkZWNsYXJlIHJlZHVjdGlvbiAoYmFy OiBUOiBvbXBfb3V0LnQgKz0gb21wX2luLnQpCi0gICAgI3ByYWdtYSBvbXAg ZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjogUzogb21wX291dC5zICo9IG9tcF9p bi5zKQkvLyB7IGRnLWVycm9yICJ3aXRoIiB9CisgICAgI3ByYWdtYSBvbXAg ZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjogUzogb21wX291dC5zICo9IG9tcF9p bi5zKQkvLyB7IGRnLW1lc3NhZ2UgInByZXZpb3VzIiB9CiAgICAgI3ByYWdt YSBvbXAgZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjogUzogb21wX291dC5zICs9 IG9tcF9pbi5zKQkvLyB7IGRnLWVycm9yICJjYW5ub3QgYmUgb3ZlcmxvYWRl ZCIgfQotICAgICNwcmFnbWEgb21wIGRlY2xhcmUgcmVkdWN0aW9uIChiYXI6 IGxvbmc6IG9tcF9vdXQgKz0gb21wX2luKQkvLyB7IGRnLWVycm9yICJ3aXRo IiB9CisgICAgI3ByYWdtYSBvbXAgZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjog bG9uZzogb21wX291dCArPSBvbXBfaW4pCS8vIHsgZGctbWVzc2FnZSAicHJl dmlvdXMiIH0KICAgICAjcHJhZ21hIG9tcCBkZWNsYXJlIHJlZHVjdGlvbiAo YmFyOiBsb25nIGludDogb21wX291dCArPSBvbXBfaW4pCS8vIHsgZGctZXJy b3IgImNhbm5vdCBiZSBvdmVybG9hZGVkIiB9CiAgICAgI3ByYWdtYSBvbXAg ZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjogc2hvcnQgdW5zaWduZWQ6IG9tcF9v dXQgKz0gb21wX2luKQogICAgICNwcmFnbWEgb21wIGRlY2xhcmUgcmVkdWN0 aW9uIChiYXI6IHNob3J0IGludDogb21wX291dCArPSBvbXBfaW4pCkBAIC0x MzIsNyArMTMyLDcgQEAgbmFtZXNwYWNlIE41CiAgIHRlbXBsYXRlIDx0eXBl bmFtZSBUPgogICBzdHJ1Y3QgVQogICB7Ci0gICAgI3ByYWdtYSBvbXAgZGVj bGFyZSByZWR1Y3Rpb24gKGJhcjogVDogb21wX291dC5zICo9IG9tcF9pbi5z KQkvLyB7IGRnLWVycm9yICJ3aXRoIiB9CisgICAgI3ByYWdtYSBvbXAgZGVj bGFyZSByZWR1Y3Rpb24gKGJhcjogVDogb21wX291dC5zICo9IG9tcF9pbi5z KQkvLyB7IGRnLW1lc3NhZ2UgInByZXZpb3VzIiB9CiAgICAgI3ByYWdtYSBv bXAgZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjogVDogb21wX291dC5zICs9IG9t cF9pbi5zKQkvLyB7IGRnLWVycm9yICJjYW5ub3QgYmUgb3ZlcmxvYWRlZCIg fQogICB9OwogICBVPFM+IHU7CkBAIC0xNTksOSArMTU5LDkgQEAgbmFtZXNw YWNlIE42CiAgIHsKICAgICB0eXBlZGVmIFYgVjI7CiAgICAgI3ByYWdtYSBv bXAgZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjogVDogb21wX291dC50ICs9IG9t cF9pbi50KQotICAgICNwcmFnbWEgb21wIGRlY2xhcmUgcmVkdWN0aW9uIChi YXI6IFY6IG9tcF9vdXQucyAqPSBvbXBfaW4ucykJLy8geyBkZy1lcnJvciAi d2l0aCIgfQorICAgICNwcmFnbWEgb21wIGRlY2xhcmUgcmVkdWN0aW9uIChi YXI6IFY6IG9tcF9vdXQucyAqPSBvbXBfaW4ucykJLy8geyBkZy1tZXNzYWdl ICJwcmV2aW91cyIgfQogICAgICNwcmFnbWEgb21wIGRlY2xhcmUgcmVkdWN0 aW9uIChiYXI6IFYyOiBvbXBfb3V0LnMgKz0gb21wX2luLnMpCS8vIHsgZGct ZXJyb3IgImNhbm5vdCBiZSBvdmVybG9hZGVkIiB9Ci0gICAgI3ByYWdtYSBv bXAgZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjogbG9uZzogb21wX291dCArPSBv bXBfaW4pCS8vIHsgZGctZXJyb3IgIndpdGgiIH0KKyAgICAjcHJhZ21hIG9t cCBkZWNsYXJlIHJlZHVjdGlvbiAoYmFyOiBsb25nOiBvbXBfb3V0ICs9IG9t cF9pbikJLy8geyBkZy1tZXNzYWdlICJwcmV2aW91cyIgfQogICAgICNwcmFn bWEgb21wIGRlY2xhcmUgcmVkdWN0aW9uIChiYXI6IGxvbmcgaW50OiBvbXBf b3V0ICs9IG9tcF9pbikJLy8geyBkZy1lcnJvciAiY2Fubm90IGJlIG92ZXJs b2FkZWQiIH0KICAgICAjcHJhZ21hIG9tcCBkZWNsYXJlIHJlZHVjdGlvbiAo YmFyOiBzaG9ydCB1bnNpZ25lZDogb21wX291dCArPSBvbXBfaW4pCiAgICAg I3ByYWdtYSBvbXAgZGVjbGFyZSByZWR1Y3Rpb24gKGJhcjogc2hvcnQgaW50 OiBvbXBfb3V0ICs9IG9tcF9pbikKSW5kZXg6IHRlc3RzdWl0ZS9nKysuZGcv b3ZlcmxvYWQvZXJyb3IxLkMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g dGVzdHN1aXRlL2crKy5kZy9vdmVybG9hZC9lcnJvcjEuQwkocmV2aXNpb24g MjQ4MjQ0KQorKysgdGVzdHN1aXRlL2crKy5kZy9vdmVybG9hZC9lcnJvcjEu Qwkod29ya2luZyBjb3B5KQpAQCAtMiw2ICsyLDYgQEAKIAogc3RydWN0IFMK IHsKLSAgdm9pZCBmICgpIHt9IC8vIHsgZGctZXJyb3IgIndpdGgiIH0KKyAg dm9pZCBmICgpIHt9IC8vIHsgZGctbWVzc2FnZSAicHJldmlvdXMiIH0KICAg aW50IGYgKCkgeyByZXR1cm4gMDsgfSAvLyB7IGRnLWVycm9yICJvdmVybG9h ZGVkIiB9CiB9OwpJbmRleDogdGVzdHN1aXRlL2crKy5kZy9vdmVybG9hZC9l cnJvcjIuQwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0ZXN0c3VpdGUv ZysrLmRnL292ZXJsb2FkL2Vycm9yMi5DCShyZXZpc2lvbiAyNDgyNDQpCisr KyB0ZXN0c3VpdGUvZysrLmRnL292ZXJsb2FkL2Vycm9yMi5DCSh3b3JraW5n IGNvcHkpCkBAIC02LDYgKzYsNiBAQAogCiBzdHJ1Y3QgQQogewotICB2b2lk IGZvbygpOyAgLy8geyBkZy1lcnJvciAid2l0aCIgfQorICB2b2lkIGZvbygp OyAgLy8geyBkZy1tZXNzYWdlICJwcmV2aW91cyIgfQogICB2aXJ0dWFsIHZv aWQgZm9vKCk7ICAvLyB7IGRnLWVycm9yICJjYW5ub3QgYmUgb3ZlcmxvYWRl ZCIgfQogfTsKSW5kZXg6IHRlc3RzdWl0ZS9nKysuZGcvdGVtcGxhdGUvZHVw bGljYXRlMS5DCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRlc3RzdWl0 ZS9nKysuZGcvdGVtcGxhdGUvZHVwbGljYXRlMS5DCShyZXZpc2lvbiAyNDgy NDQpCisrKyB0ZXN0c3VpdGUvZysrLmRnL3RlbXBsYXRlL2R1cGxpY2F0ZTEu Qwkod29ya2luZyBjb3B5KQpAQCAtMiw2ICsyLDYgQEAKIAogdGVtcGxhdGU8 aW50PiBzdHJ1Y3QgQQogewotICB+QSgpIHt9CS8vIHsgZGctZXJyb3IgIndp dGgiIH0KKyAgfkEoKSB7fQkvLyB7IGRnLW1lc3NhZ2UgInByZXZpb3VzIiB9 CiAgIH5BKCkge30JLy8geyBkZy1lcnJvciAiY2Fubm90IGJlIG92ZXJsb2Fk ZWQiIH0KIH07CkluZGV4OiB0ZXN0c3VpdGUvZysrLm9sZC1kZWphL2crKy5i ZW5qYW1pbi93YXJuMDIuQwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0 ZXN0c3VpdGUvZysrLm9sZC1kZWphL2crKy5iZW5qYW1pbi93YXJuMDIuQwko cmV2aXNpb24gMjQ4MjQ0KQorKysgdGVzdHN1aXRlL2crKy5vbGQtZGVqYS9n KysuYmVuamFtaW4vd2FybjAyLkMJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcg KzMxLDcgQEAgY2xhc3MgQwogY2xhc3MgRAogewogcHVibGljOgotICBpbnQg Zm9vMigpIHtyZXR1cm4gYjt9ICAvLyB7IGRnLWVycm9yICJ3aXRoIiB9IAor ICBpbnQgZm9vMigpIHtyZXR1cm4gYjt9ICAvLyB7IGRnLW1lc3NhZ2UgInBy ZXZpb3VzIiB9IAogICBpbnQgZm9vMigpIHtyZXR1cm4gYjt9ICAvLyB7IGRn LWVycm9yICJvdmVybG9hZGVkIiB9IAogICBpbnQgYjsKIH07CkBAIC0zOSw3 ICszOSw3IEBAIGNsYXNzIEQKIGNsYXNzIEUKIHsKIHB1YmxpYzoKLSAgaW50 IGZvbzIoKTsgLy8geyBkZy1lcnJvciAid2l0aCIgfSAKKyAgaW50IGZvbzIo KTsgLy8geyBkZy1tZXNzYWdlICJwcmV2aW91cyIgfSAKICAgaW50IGZvbzIo KTsgLy8geyBkZy1lcnJvciAib3ZlcmxvYWRlZCIgfSAKICAgaW50IGI7CiB9 OwpJbmRleDogdGVzdHN1aXRlL2crKy5vbGQtZGVqYS9nKysuYnJlbmRhbi9h cm0yLkMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGVzdHN1aXRlL2cr Ky5vbGQtZGVqYS9nKysuYnJlbmRhbi9hcm0yLkMJKHJldmlzaW9uIDI0ODI0 NCkKKysrIHRlc3RzdWl0ZS9nKysub2xkLWRlamEvZysrLmJyZW5kYW4vYXJt Mi5DCSh3b3JraW5nIGNvcHkpCkBAIC04LDEyICs4LDEyIEBACiAKIGNsYXNz IFggewogcHVibGljOgotICBpbnQgZm9vKCk7ICAgICAgICAgICAgLy8geyBk Zy1lcnJvciAid2l0aCIgfQorICBpbnQgZm9vKCk7ICAgICAgICAgICAgLy8g eyBkZy1tZXNzYWdlICJwcmV2aW91cyIgfQogICBzdGF0aWMgaW50IGZvbygp OwkvLyBlcnJvcjogcmVkZWNsYXJhdGlvbi8vIHsgZGctZXJyb3IgIm92ZXJs b2FkZWQiIH0gLioKIH07CiAKIGNsYXNzIFkgewogcHVibGljOgotICAgc3Rh dGljIGludCBmb28oKTsgICAgLy8geyBkZy1lcnJvciAid2l0aCIgfQorICAg c3RhdGljIGludCBmb28oKTsgICAgLy8geyBkZy1tZXNzYWdlICJwcmV2aW91 cyIgfQogICBpbnQgZm9vKCk7CQkvLyBlcnJvcjogcmVkZWNsYXJhdGlvbi8v IHsgZGctZXJyb3IgIm92ZXJsb2FkZWQiIH0gLioKIH07CkluZGV4OiB0ZXN0 c3VpdGUvZysrLm9sZC1kZWphL2crKy5vdGhlci9yZWRlY2wyLkMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gdGVzdHN1aXRlL2crKy5vbGQtZGVqYS9n Kysub3RoZXIvcmVkZWNsMi5DCShyZXZpc2lvbiAyNDgyNDQpCisrKyB0ZXN0 c3VpdGUvZysrLm9sZC1kZWphL2crKy5vdGhlci9yZWRlY2wyLkMJKHdvcmtp bmcgY29weSkKQEAgLTEsOSArMSw5IEBACiAvLyB7IGRnLWRvIGFzc2VtYmxl ICB9CiAKIHN0cnVjdCBTIHsKLSAgUyhpbnQpOyAvLyB7IGRnLWVycm9yICJ3 aXRoIiB9CisgIFMoaW50KTsgLy8geyBkZy1tZXNzYWdlICJwcmV2aW91cyIg fQogICBTKGludCk7IC8vIHsgZGctZXJyb3IgIm92ZXJsb2FkZWQiIH0gYWxy ZWFkeSBkZWNsYXJlZAogCi0gIH5TKCk7Ly8geyBkZy1lcnJvciAid2l0aCIg fQorICB+UygpOy8vIHsgZGctbWVzc2FnZSAicHJldmlvdXMiIH0KICAgflMo KTsgLy8geyBkZy1lcnJvciAib3ZlcmxvYWRlZCIgfSBhbHJlYWR5IGRlY2xh cmVkCiB9OwpJbmRleDogdGVzdHN1aXRlL2crKy5vbGQtZGVqYS9nKysub3Ro ZXIvcmVkZWNsNC5DCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRlc3Rz dWl0ZS9nKysub2xkLWRlamEvZysrLm90aGVyL3JlZGVjbDQuQwkocmV2aXNp b24gMjQ4MjQ0KQorKysgdGVzdHN1aXRlL2crKy5vbGQtZGVqYS9nKysub3Ro ZXIvcmVkZWNsNC5DCSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzEsNyBAQAog Ly8geyBkZy1kbyBhc3NlbWJsZSAgfQogaW50IG1haW4oKSB7CiAgIHN0cnVj dCBBIHsKLSAgICB2b2lkIGYoKTsJCQkvLyB7IGRnLWVycm9yICJ3aXRoIiB9 IGFscmVhZHkgZGVjbGFyZWQKKyAgICB2b2lkIGYoKTsJCQkvLyB7IGRnLW1l c3NhZ2UgInByZXZpb3VzIiB9IGFscmVhZHkgZGVjbGFyZWQKICAgICB2b2lk IGYoKTsJCQkvLyB7IGRnLWVycm9yICJvdmVybG9hZGVkIiB9IGFscmVhZHkg ZGVjbGFyZWQKICAgfTsKIH0KSW5kZXg6IHRlc3RzdWl0ZS9nKysub2xkLWRl amEvZysrLnB0L21lbXRlbXA3OC5DCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIHRlc3RzdWl0ZS9nKysub2xkLWRlamEvZysrLnB0L21lbXRlbXA3OC5D CShyZXZpc2lvbiAyNDgyNDQpCisrKyB0ZXN0c3VpdGUvZysrLm9sZC1kZWph L2crKy5wdC9tZW10ZW1wNzguQwkod29ya2luZyBjb3B5KQpAQCAtMjMsNyAr MjMsNyBAQCB0ZW1wbGF0ZSBzdHJ1Y3QgQjxpbnQ+Owogc3RydWN0IEMgCiB7 CiAgIHRlbXBsYXRlIDxjbGFzcyBVPgotICB2b2lkIGYoKSB7fSAgLy8geyBk Zy1lcnJvciAid2l0aCIgfSByZWRlY2xhcmF0aW9uCisgIHZvaWQgZigpIHt9 ICAvLyB7IGRnLW1lc3NhZ2UgInByZXZpb3VzIiB9IHJlZGVjbGFyYXRpb24K IAogICB0ZW1wbGF0ZSA8Y2xhc3MgVT4KICAgdm9pZCBmKCkge30gIC8vIHsg ZGctZXJyb3IgIm92ZXJsb2FkZWQiIH0gcmVkZWNsYXJhdGlvbgpAQCAtNDIs NyArNDIsNyBAQCB0ZW1wbGF0ZSBzdHJ1Y3QgRDxpbnQsIGRvdWJsZT47CiB0 ZW1wbGF0ZSA8Y2xhc3MgVCwgY2xhc3MgVT4KIHN0cnVjdCBEMgogewotICB2 b2lkIGYoVCk7IC8vIHsgZGctZXJyb3IgIndpdGgiIH0gcmVkZWNsYXJhdGlv biAKKyAgdm9pZCBmKFQpOyAvLyB7IGRnLW1lc3NhZ2UgInByZXZpb3VzIiB9 IHJlZGVjbGFyYXRpb24gCiAgIHZvaWQgZihVKTsgLy8geyBkZy1lcnJvciAi b3ZlcmxvYWRlZCIgfSByZWRlY2xhcmF0aW9uIAogfTsKIApAQCAtNTAsNyAr NTAsNyBAQCB0ZW1wbGF0ZSBzdHJ1Y3QgRDI8aW50LCBpbnQ+OwogCiBzdHJ1 Y3QgRQogewotICB2b2lkIGYoKTsgIC8vIHsgZGctZXJyb3IgIndpdGgiIH0g cmVkZWNsYXJhdGlvbgorICB2b2lkIGYoKTsgIC8vIHsgZGctbWVzc2FnZSAi cHJldmlvdXMiIH0gcmVkZWNsYXJhdGlvbgogICB2b2lkIGYoKTsgLy8geyBk Zy1lcnJvciAib3ZlcmxvYWRlZCIgfSByZWRlY2xhcmF0aW9uCiB9OwogCg== --------------9190AFFC18A1DA5A2D32EA03--