From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27281 invoked by alias); 16 Apr 2015 12:29:19 -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 27258 invoked by uid 89); 16 Apr 2015 12:29:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL,BAYES_00,KAM_ASCII_DIVIDERS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 16 Apr 2015 12:29:17 +0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t3GCTEOx008374 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Apr 2015 12:29:15 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t3GCTEWa014785 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Thu, 16 Apr 2015 12:29:14 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t3GCTEu6029522; Thu, 16 Apr 2015 12:29:14 GMT Received: from [192.168.1.4] (/79.35.214.201) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 16 Apr 2015 05:29:13 -0700 Message-ID: <552FAB17.8090609@oracle.com> Date: Thu, 16 Apr 2015 12:29:00 -0000 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Jason Merrill , "gcc-patches@gcc.gnu.org" Subject: Re: [C++ Patch] PR 65340 References: <55085FB7.8090303@oracle.com> <5508C2BD.80804@redhat.com> <5508DCFB.7020103@oracle.com> <5508DFD6.5070503@redhat.com> <552DBF66.4020101@redhat.com> In-Reply-To: <552DBF66.4020101@redhat.com> Content-Type: multipart/mixed; boundary="------------090505060002060104080801" X-IsSubscribed: yes X-SW-Source: 2015-04/txt/msg00808.txt.bz2 This is a multi-part message in MIME format. --------------090505060002060104080801 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 377 Hi again, On 04/15/2015 03:31 AM, Jason Merrill wrote: > There are various places in the compiler that error and continue if > tf_error is set, but return error_mark_node immediately if not; it > seems reasonable to follow that pattern in the places that don't > currently check the return value. Thus I tested the below. Ok for trunk? Thanks, Paolo. /////////////////// --------------090505060002060104080801 Content-Type: text/plain; charset=UTF-8; name="CL_mark_used" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="CL_mark_used" Content-length: 793 MjAxNS0wNC0xNiAgUGFvbG8gQ2FybGluaSAgPHBhb2xvLmNhcmxpbmlAb3Jh Y2xlLmNvbT4KCgkqIGNhbGwuYyAoYnVpbGRfb3BfZGVsZXRlX2NhbGwsIGJ1 aWxkX292ZXJfY2FsbCk6IENoZWNrIG1hcmtfdXNlZAoJcmV0dXJuIHZhbHVl LgoJKiBjbGFzcy5jIChyZXNvbHZlX2FkZHJlc3Nfb2Zfb3ZlcmxvYWRlZF9m dW5jdGlvbik6IExpa2V3aXNlLgoJKiBkZWNsLmMgKGN4eF9tYXliZV9idWls ZF9jbGVhbnVwKTogTGlrZXdpc2UuCgkqIHB0LmMgKGdlbl9lbGVtX29mX3Bh Y2tfZXhwYW5zaW9uX2luc3RhbnRpYXRpb24sIHRzdWJzdF9iYXNlbGluaywK CXRzdWJzdF9xdWFsaWZpZWRfaWQsIHRzdWJzdF9jb3B5LCB0c3Vic3RfY29w eV9hbmRfYnVpbGQpOiBMaWtld2lzZS4KCSogcnR0aS5jIChidWlsZF9keW5h bWljX2Nhc3RfMSk6IExpa2V3aXNlLgoJKiBzZW1hbnRpY3MuYyAocHJvY2Vz c19vdXRlcl92YXJfcmVmKTogTGlrZXdpc2UuCgkqIHR5cGVjay5jIChidWls ZF9jbGFzc19tZW1iZXJfYWNjZXNzX2V4cHIsCgljcF9idWlsZF9mdW5jdGlv bl9jYWxsX3ZlYywgY3BfYnVpbGRfYWRkcl9leHByXzEpOiBMaWtld2lzZS4K --------------090505060002060104080801 Content-Type: text/plain; charset=UTF-8; name="patch_mark_used" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch_mark_used" Content-length: 12611 SW5kZXg6IGNhbGwuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBjYWxs LmMJKHJldmlzaW9uIDIyMjE0MykKKysrIGNhbGwuYwkod29ya2luZyBjb3B5 KQpAQCAtNTk2OCw3ICs1OTY4LDggQEAgYnVpbGRfb3BfZGVsZXRlX2NhbGwg KGVudW0gdHJlZV9jb2RlIGNvZGUsIHRyZWUgYWQKIAkgIGFyZ2FycmF5WzBd ID0gYWRkcjsKIAkgIGZvciAoaSA9IDE7IGkgPCBuYXJnczsgaSsrKQogCSAg ICBhcmdhcnJheVtpXSA9IENBTExfRVhQUl9BUkcgKHBsYWNlbWVudCwgaSk7 Ci0JICBtYXJrX3VzZWQgKGZuKTsKKwkgIGlmICghbWFya191c2VkIChmbiwg Y29tcGxhaW4pICYmICEoY29tcGxhaW4gJiB0Zl9lcnJvcikpCisJICAgIHJl dHVybiBlcnJvcl9tYXJrX25vZGU7CiAJICByZXR1cm4gYnVpbGRfY3h4X2Nh bGwgKGZuLCBuYXJncywgYXJnYXJyYXksIGNvbXBsYWluKTsKIAl9CiAgICAg ICBlbHNlCkBAIC03NDAwLDcgKzc0MDEsOCBAQCBidWlsZF9vdmVyX2NhbGwg KHN0cnVjdCB6X2NhbmRpZGF0ZSAqY2FuZCwgaW50IGZsYQogCSB0aGUgaW1w bGVtZW50YXRpb24gZWxpZGVkIGl0cyB1c2UuICAqLwogICAgICAgaWYgKCF0 cml2aWFsIHx8IERFQ0xfREVMRVRFRF9GTiAoZm4pKQogCXsKLQkgIG1hcmtf dXNlZCAoZm4pOworCSAgaWYgKCFtYXJrX3VzZWQgKGZuLCBjb21wbGFpbikg JiYgIShjb21wbGFpbiAmIHRmX2Vycm9yKSkKKwkgICAgcmV0dXJuIGVycm9y X21hcmtfbm9kZTsKIAkgIGFscmVhZHlfdXNlZCA9IHRydWU7CiAJfQogCklu ZGV4OiBjbGFzcy5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNsYXNz LmMJKHJldmlzaW9uIDIyMjE0MykKKysrIGNsYXNzLmMJKHdvcmtpbmcgY29w eSkKQEAgLTc3NTUsOCArNzc1NSw4IEBAIHJlc29sdmVfYWRkcmVzc19vZl9v dmVybG9hZGVkX2Z1bmN0aW9uICh0cmVlIHRhcmdlCiAgICAgICAvKiBNYWtl ID1kZWxldGUgd29yayB3aXRoIFNGSU5BRS4gICovCiAgICAgICBpZiAoREVD TF9ERUxFVEVEX0ZOIChmbikgJiYgIShmbGFncyAmIHRmX2Vycm9yKSkKIAly ZXR1cm4gZXJyb3JfbWFya19ub2RlOwotICAgICAgCi0gICAgICBtYXJrX3Vz ZWQgKGZuKTsKKyAgICAgIGlmICghbWFya191c2VkIChmbiwgZmxhZ3MpICYm ICEoZmxhZ3MgJiB0Zl9lcnJvcikpCisJcmV0dXJuIGVycm9yX21hcmtfbm9k ZTsKICAgICB9CiAKICAgLyogV2UgY291bGQgbm90IGNoZWNrIGFjY2VzcyB0 byBtZW1iZXIgZnVuY3Rpb25zIHdoZW4gdGhpcwpJbmRleDogZGVjbC5jCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIGRlY2wuYwkocmV2aXNpb24gMjIy MTQzKQorKysgZGVjbC5jCSh3b3JraW5nIGNvcHkpCkBAIC0xNDU4Nyw3ICsx NDU4Nyw4IEBAIGN4eF9tYXliZV9idWlsZF9jbGVhbnVwICh0cmVlIGRlY2ws IHRzdWJzdF9mbGFnc190CiAJIG9yZGluYXJ5IEZVTkNUSU9OX0RFQ0wuICAq LwogICAgICAgZm4gPSBsb29rdXBfbmFtZSAoaWQpOwogICAgICAgYXJnID0g YnVpbGRfYWRkcmVzcyAoZGVjbCk7Ci0gICAgICBtYXJrX3VzZWQgKGRlY2wp OworICAgICAgaWYgKCFtYXJrX3VzZWQgKGRlY2wsIGNvbXBsYWluKSAmJiAh KGNvbXBsYWluICYgdGZfZXJyb3IpKQorCXJldHVybiBlcnJvcl9tYXJrX25v ZGU7CiAgICAgICBjbGVhbnVwID0gY3BfYnVpbGRfZnVuY3Rpb25fY2FsbF9u YXJ5IChmbiwgY29tcGxhaW4sIGFyZywgTlVMTF9UUkVFKTsKICAgICAgIGlm IChjbGVhbnVwID09IGVycm9yX21hcmtfbm9kZSkKIAlyZXR1cm4gZXJyb3Jf bWFya19ub2RlOwpAQCAtMTQ2MjcsMTAgKzE0NjI4LDExIEBAIGN4eF9tYXli ZV9idWlsZF9jbGVhbnVwICh0cmVlIGRlY2wsIHRzdWJzdF9mbGFnc190CiAg ICAgU0VUX0VYUFJfTE9DQVRJT04gKGNsZWFudXAsIFVOS05PV05fTE9DQVRJ T04pOwogCiAgIGlmIChjbGVhbnVwCi0gICAgICAmJiAhbG9va3VwX2F0dHJp YnV0ZSAoIndhcm5fdW51c2VkIiwgVFlQRV9BVFRSSUJVVEVTIChUUkVFX1RZ UEUgKGRlY2wpKSkpCi0gICAgLyogVHJlYXQgb2JqZWN0cyB3aXRoIGRlc3Ry dWN0b3JzIGFzIHVzZWQ7IHRoZSBkZXN0cnVjdG9yIG1heSBkbwotICAgICAg IHNvbWV0aGluZyBzdWJzdGFudGl2ZS4gICovCi0gICAgbWFya191c2VkIChk ZWNsKTsKKyAgICAgICYmICFsb29rdXBfYXR0cmlidXRlICgid2Fybl91bnVz ZWQiLCBUWVBFX0FUVFJJQlVURVMgKFRSRUVfVFlQRSAoZGVjbCkpKQorICAg ICAgLyogVHJlYXQgb2JqZWN0cyB3aXRoIGRlc3RydWN0b3JzIGFzIHVzZWQ7 IHRoZSBkZXN0cnVjdG9yIG1heSBkbworCSBzb21ldGhpbmcgc3Vic3RhbnRp dmUuICAqLworICAgICAgJiYgIW1hcmtfdXNlZCAoZGVjbCwgY29tcGxhaW4p ICYmICEoY29tcGxhaW4gJiB0Zl9lcnJvcikpCisgICAgcmV0dXJuIGVycm9y X21hcmtfbm9kZTsKIAogICByZXR1cm4gY2xlYW51cDsKIH0KSW5kZXg6IHB0 LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcHQuYwkocmV2aXNpb24g MjIyMTQzKQorKysgcHQuYwkod29ya2luZyBjb3B5KQpAQCAtOTgzMyw3ICs5 ODMzLDggQEAgZ2VuX2VsZW1fb2ZfcGFja19leHBhbnNpb25faW5zdGFudGlh dGlvbiAodHJlZSBwYXQKIAkgIGlmIChpbmRleCA9PSAwKQogCSAgICB7CiAJ ICAgICAgYXBzID0gbWFrZV9hcmd1bWVudF9wYWNrX3NlbGVjdCAoYXJnX3Bh Y2ssIGluZGV4KTsKLQkgICAgICBtYXJrX3VzZWQgKHBhcm0pOworCSAgICAg IGlmICghbWFya191c2VkIChwYXJtLCBjb21wbGFpbikgJiYgIShjb21wbGFp biAmIHRmX2Vycm9yKSkKKwkJcmV0dXJuIGVycm9yX21hcmtfbm9kZTsKIAkg ICAgICByZWdpc3Rlcl9sb2NhbF9zcGVjaWFsaXphdGlvbiAoYXBzLCBwYXJt KTsKIAkgICAgfQogCSAgZWxzZQpAQCAtMTI2MDMsOCArMTI2MDQsOSBAQCB0 c3Vic3RfYmFzZWxpbmsgKHRyZWUgYmFzZWxpbmssIHRyZWUgb2JqZWN0X3R5 cGUsCiAgICAgICAgcG9pbnQuKSAgKi8KICAgICBpZiAoQkFTRUxJTktfUCAo YmFzZWxpbmspKQogICAgICAgZm5zID0gQkFTRUxJTktfRlVOQ1RJT05TIChi YXNlbGluayk7Ci0gICAgaWYgKCF0ZW1wbGF0ZV9pZF9wICYmICFyZWFsbHlf b3ZlcmxvYWRlZF9mbiAoZm5zKSkKLSAgICAgIG1hcmtfdXNlZCAoT1ZMX0NV UlJFTlQgKGZucykpOworICAgIGlmICghdGVtcGxhdGVfaWRfcCAmJiAhcmVh bGx5X292ZXJsb2FkZWRfZm4gKGZucykKKwkmJiAhbWFya191c2VkIChPVkxf Q1VSUkVOVCAoZm5zKSwgY29tcGxhaW4pICYmICEoY29tcGxhaW4gJiB0Zl9l cnJvcikpCisgICAgICByZXR1cm4gZXJyb3JfbWFya19ub2RlOwogCiAgICAg LyogQWRkIGJhY2sgdGhlIHRlbXBsYXRlIGFyZ3VtZW50cywgaWYgcHJlc2Vu dC4gICovCiAgICAgaWYgKEJBU0VMSU5LX1AgKGJhc2VsaW5rKSAmJiB0ZW1w bGF0ZV9pZF9wKQpAQCAtMTI3MTksNyArMTI3MjEsOCBAQCB0c3Vic3RfcXVh bGlmaWVkX2lkICh0cmVlIHF1YWxpZmllZF9pZCwgdHJlZSBhcmdzLAogICAg ICAgY2hlY2tfYWNjZXNzaWJpbGl0eV9vZl9xdWFsaWZpZWRfaWQgKGV4cHIs IC8qb2JqZWN0X3R5cGU9Ki9OVUxMX1RSRUUsCiAJCQkJCSAgIHNjb3BlKTsK ICAgICAgIC8qIFJlbWVtYmVyIHRoYXQgdGhlcmUgd2FzIGEgcmVmZXJlbmNl IHRvIHRoaXMgZW50aXR5LiAgKi8KLSAgICAgIG1hcmtfdXNlZCAoZXhwcik7 CisgICAgICBpZiAoIW1hcmtfdXNlZCAoZXhwciwgY29tcGxhaW4pICYmICEo Y29tcGxhaW4gJiB0Zl9lcnJvcikpCisJcmV0dXJuIGVycm9yX21hcmtfbm9k ZTsKICAgICB9CiAKICAgaWYgKGV4cHIgPT0gZXJyb3JfbWFya19ub2RlIHx8 IFRSRUVfQ09ERSAoZXhwcikgPT0gVFJFRV9MSVNUKQpAQCAtMTI4MjksNyAr MTI4MzIsOCBAQCB0c3Vic3RfY29weSAodHJlZSB0LCB0cmVlIGFyZ3MsIHRz dWJzdF9mbGFnc190IGNvbQogICAgICAgCiAgICAgICBpZiAoVFJFRV9DT0RF IChyKSA9PSBBUkdVTUVOVF9QQUNLX1NFTEVDVCkKIAlyID0gQVJHVU1FTlRf UEFDS19TRUxFQ1RfQVJHIChyKTsKLSAgICAgIG1hcmtfdXNlZCAocik7Cisg ICAgICBpZiAoIW1hcmtfdXNlZCAociwgY29tcGxhaW4pICYmICEoY29tcGxh aW4gJiB0Zl9lcnJvcikpCisJcmV0dXJuIGVycm9yX21hcmtfbm9kZTsKICAg ICAgIHJldHVybiByOwogCiAgICAgY2FzZSBDT05TVF9ERUNMOgpAQCAtMTI5 ODYsNyArMTI5OTAsOCBAQCB0c3Vic3RfY29weSAodHJlZSB0LCB0cmVlIGFy Z3MsIHRzdWJzdF9mbGFnc190IGNvbQogCX0KICAgICAgIGVsc2UKIAlyID0g dDsKLSAgICAgIG1hcmtfdXNlZCAocik7CisgICAgICBpZiAoIW1hcmtfdXNl ZCAociwgY29tcGxhaW4pICYmICEoY29tcGxhaW4gJiB0Zl9lcnJvcikpCisJ cmV0dXJuIGVycm9yX21hcmtfbm9kZTsKICAgICAgIHJldHVybiByOwogCiAg ICAgY2FzZSBOQU1FU1BBQ0VfREVDTDoKQEAgLTEzMzUwLDcgKzEzMzU1LDkg QEAgdHN1YnN0X2NvcHkgKHRyZWUgdCwgdHJlZSBhcmdzLCB0c3Vic3RfZmxh Z3NfdCBjb20KIAl0cmVlIG9wMSA9IHRzdWJzdF9jb3B5IChUUkVFX09QRVJB TkQgKHQsIDEpLCBhcmdzLCBjb21wbGFpbiwgaW5fZGVjbCk7CiAJciA9IGJ1 aWxkMiAoY29kZSwgdHlwZSwgb3AwLCBvcDEpOwogCVBUUk1FTV9PS19QIChy KSA9IFBUUk1FTV9PS19QICh0KTsKLQltYXJrX3VzZWQgKFRSRUVfT1BFUkFO RCAociwgMSkpOworCWlmICghbWFya191c2VkIChUUkVFX09QRVJBTkQgKHIs IDEpLCBjb21wbGFpbikKKwkgICAgJiYgIShjb21wbGFpbiAmIHRmX2Vycm9y KSkKKwkgIHJldHVybiBlcnJvcl9tYXJrX25vZGU7CiAJcmV0dXJuIHI7CiAg ICAgICB9CiAKQEAgLTE0ODY4LDggKzE0ODc1LDkgQEAgdHN1YnN0X2NvcHlf YW5kX2J1aWxkICh0cmVlIHQsCiAgICAgICBvcDEgPSB0c3Vic3Rfbm9uX2Nh bGxfcG9zdGZpeF9leHByZXNzaW9uIChUUkVFX09QRVJBTkQgKHQsIDApLAog CQkJCQkJYXJncywgY29tcGxhaW4sIGluX2RlY2wpOwogICAgICAgLyogUmVt ZW1iZXIgdGhhdCB0aGVyZSB3YXMgYSByZWZlcmVuY2UgdG8gdGhpcyBlbnRp dHkuICAqLwotICAgICAgaWYgKERFQ0xfUCAob3AxKSkKLQltYXJrX3VzZWQg KG9wMSk7CisgICAgICBpZiAoREVDTF9QIChvcDEpCisJICAmJiAhbWFya191 c2VkIChvcDEsIGNvbXBsYWluKSAmJiAhKGNvbXBsYWluICYgdGZfZXJyb3Ip KQorCVJFVFVSTiAoZXJyb3JfbWFya19ub2RlKTsKICAgICAgIFJFVFVSTiAo YnVpbGRfeF9hcnJvdyAoaW5wdXRfbG9jYXRpb24sIG9wMSwgY29tcGxhaW4p KTsKIAogICAgIGNhc2UgTkVXX0VYUFI6CkBAIC0xNTEyMCw4ICsxNTEyOCw5 IEBAIHRzdWJzdF9jb3B5X2FuZF9idWlsZCAodHJlZSB0LAogCSAgfQogCiAJ LyogUmVtZW1iZXIgdGhhdCB0aGVyZSB3YXMgYSByZWZlcmVuY2UgdG8gdGhp cyBlbnRpdHkuICAqLwotCWlmIChERUNMX1AgKGZ1bmN0aW9uKSkKLQkgIG1h cmtfdXNlZCAoZnVuY3Rpb24sIGNvbXBsYWluKTsKKwlpZiAoREVDTF9QIChm dW5jdGlvbikKKwkgICAgJiYgIW1hcmtfdXNlZCAoZnVuY3Rpb24sIGNvbXBs YWluKSAmJiAhKGNvbXBsYWluICYgdGZfZXJyb3IpKQorCSAgUkVUVVJOIChl cnJvcl9tYXJrX25vZGUpOwogCiAJLyogUHV0IGJhY2sgdGZfZGVjbHR5cGUg Zm9yIHRoZSBhY3R1YWwgY2FsbC4gICovCiAJY29tcGxhaW4gfD0gZGVjbHR5 cGVfZmxhZzsKQEAgLTE1MzA0LDggKzE1MzEzLDkgQEAgdHN1YnN0X2NvcHlf YW5kX2J1aWxkICh0cmVlIHQsCiAJb2JqZWN0ID0gdHN1YnN0X25vbl9jYWxs X3Bvc3RmaXhfZXhwcmVzc2lvbiAoVFJFRV9PUEVSQU5EICh0LCAwKSwKIAkJ CQkJCSAgICAgYXJncywgY29tcGxhaW4sIGluX2RlY2wpOwogCS8qIFJlbWVt YmVyIHRoYXQgdGhlcmUgd2FzIGEgcmVmZXJlbmNlIHRvIHRoaXMgZW50aXR5 LiAgKi8KLQlpZiAoREVDTF9QIChvYmplY3QpKQotCSAgbWFya191c2VkIChv YmplY3QpOworCWlmIChERUNMX1AgKG9iamVjdCkKKwkgICAgJiYgIW1hcmtf dXNlZCAob2JqZWN0LCBjb21wbGFpbikgJiYgIShjb21wbGFpbiAmIHRmX2Vy cm9yKSkKKwkgIFJFVFVSTiAoZXJyb3JfbWFya19ub2RlKTsKIAlvYmplY3Rf dHlwZSA9IFRSRUVfVFlQRSAob2JqZWN0KTsKIAogCW1lbWJlciA9IFRSRUVf T1BFUkFORCAodCwgMSk7CkluZGV4OiBydHRpLmMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gcnR0aS5jCShyZXZpc2lvbiAyMjIxNDMpCisrKyBydHRp LmMJKHdvcmtpbmcgY29weSkKQEAgLTcwOCwxMCArNzA4LDEyIEBAIGJ1aWxk X2R5bmFtaWNfY2FzdF8xICh0cmVlIHR5cGUsIHRyZWUgZXhwciwgdHN1YnN0 CiAJICB0YXJnZXRfdHlwZSA9IFRZUEVfTUFJTl9WQVJJQU5UIChUUkVFX1RZ UEUgKHR5cGUpKTsKIAkgIHN0YXRpY190eXBlID0gVFlQRV9NQUlOX1ZBUklB TlQgKFRSRUVfVFlQRSAoZXhwcnR5cGUpKTsKIAkgIHRkMiA9IGdldF90aW5m b19kZWNsICh0YXJnZXRfdHlwZSk7Ci0JICBtYXJrX3VzZWQgKHRkMik7CisJ ICBpZiAoIW1hcmtfdXNlZCAodGQyLCBjb21wbGFpbikgJiYgIShjb21wbGFp biAmIHRmX2Vycm9yKSkKKwkgICAgcmV0dXJuIGVycm9yX21hcmtfbm9kZTsK IAkgIHRkMiA9IGNwX2J1aWxkX2FkZHJfZXhwciAodGQyLCBjb21wbGFpbik7 CiAJICB0ZDMgPSBnZXRfdGluZm9fZGVjbCAoc3RhdGljX3R5cGUpOwotCSAg bWFya191c2VkICh0ZDMpOworCSAgaWYgKCFtYXJrX3VzZWQgKHRkMywgY29t cGxhaW4pICYmICEoY29tcGxhaW4gJiB0Zl9lcnJvcikpCisJICAgIHJldHVy biBlcnJvcl9tYXJrX25vZGU7CiAJICB0ZDMgPSBjcF9idWlsZF9hZGRyX2V4 cHIgKHRkMywgY29tcGxhaW4pOwogCiAJICAvKiBEZXRlcm1pbmUgaG93IFQg YW5kIFYgYXJlIHJlbGF0ZWQuICAqLwpJbmRleDogc2VtYW50aWNzLmMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gc2VtYW50aWNzLmMJKHJldmlzaW9u IDIyMjE0MykKKysrIHNlbWFudGljcy5jCSh3b3JraW5nIGNvcHkpCkBAIC0z MTE3LDcgKzMxMTcsOCBAQCBwcm9jZXNzX291dGVyX3Zhcl9yZWYgKHRyZWUg ZGVjbCwgdHN1YnN0X2ZsYWdzX3QgYwogICB0cmVlIGluaXRpYWxpemVyID0g Y29udmVydF9mcm9tX3JlZmVyZW5jZSAoZGVjbCk7CiAKICAgLyogTWFyayBp dCBhcyB1c2VkIG5vdyBldmVuIGlmIHRoZSB1c2UgaXMgaWxsLWZvcm1lZC4g ICovCi0gIG1hcmtfdXNlZCAoZGVjbCk7CisgIGlmICghbWFya191c2VkIChk ZWNsLCBjb21wbGFpbikgJiYgIShjb21wbGFpbiAmIHRmX2Vycm9yKSkKKyAg ICByZXR1cm4gZXJyb3JfbWFya19ub2RlOwogCiAgIC8qIENvcmUgaXNzdWUg Njk2OiAiW0F0IHRoZSBKdWx5IDIwMDkgbWVldGluZ10gdGhlIENXRyBleHBy ZXNzZWQKICAgICAgc3VwcG9ydCBmb3IgYW4gYXBwcm9hY2ggaW4gd2hpY2gg YSByZWZlcmVuY2UgdG8gYSBsb2NhbApJbmRleDogdHlwZWNrLmMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gdHlwZWNrLmMJKHJldmlzaW9uIDIyMjE0 MykKKysrIHR5cGVjay5jCSh3b3JraW5nIGNvcHkpCkBAIC0yMjk4LDcgKzIy OTgsOCBAQCBidWlsZF9jbGFzc19tZW1iZXJfYWNjZXNzX2V4cHIgKHRyZWUg b2JqZWN0LCB0cmVlCiAgIGlmIChERUNMX1AgKG1lbWJlcikpCiAgICAgewog ICAgICAgbWVtYmVyX3Njb3BlID0gREVDTF9DTEFTU19DT05URVhUIChtZW1i ZXIpOwotICAgICAgbWFya191c2VkIChtZW1iZXIpOworICAgICAgaWYgKCFt YXJrX3VzZWQgKG1lbWJlciwgY29tcGxhaW4pICYmICEoY29tcGxhaW4gJiB0 Zl9lcnJvcikpCisJcmV0dXJuIGVycm9yX21hcmtfbm9kZTsKICAgICAgIGlm IChUUkVFX0RFUFJFQ0FURUQgKG1lbWJlcikpCiAJd2Fybl9kZXByZWNhdGVk X3VzZSAobWVtYmVyLCBOVUxMX1RSRUUpOwogICAgIH0KQEAgLTM0NzcsNyAr MzQ3OCw4IEBAIGNwX2J1aWxkX2Z1bmN0aW9uX2NhbGxfdmVjICh0cmVlIGZ1 bmN0aW9uLCB2ZWM8dHJlCiAKICAgaWYgKFRSRUVfQ09ERSAoZnVuY3Rpb24p ID09IEZVTkNUSU9OX0RFQ0wpCiAgICAgewotICAgICAgbWFya191c2VkIChm dW5jdGlvbik7CisgICAgICBpZiAoIW1hcmtfdXNlZCAoZnVuY3Rpb24sIGNv bXBsYWluKSAmJiAhKGNvbXBsYWluICYgdGZfZXJyb3IpKQorCXJldHVybiBl cnJvcl9tYXJrX25vZGU7CiAgICAgICBmbmRlY2wgPSBmdW5jdGlvbjsKIAog ICAgICAgLyogQ29udmVydCBhbnl0aGluZyB3aXRoIGZ1bmN0aW9uIHR5cGUg dG8gYSBwb2ludGVyLXRvLWZ1bmN0aW9uLiAgKi8KQEAgLTUzNzYsNyArNTM3 OCw4IEBAIGNwX2J1aWxkX2FkZHJfZXhwcl8xICh0cmVlIGFyZywgYm9vbCBz dHJpY3RfbHZhbHVlCiAJIGFuZCB0aGUgY3JlYXRlZCBPRkZTRVRfUkVGLiAg Ki8KICAgICAgIHRyZWUgYmFzZSA9IFRZUEVfTUFJTl9WQVJJQU5UIChUUkVF X1RZUEUgKFRSRUVfT1BFUkFORCAoYXJnLCAwKSkpOwogICAgICAgdHJlZSBm biA9IGdldF9maXJzdF9mbiAoVFJFRV9PUEVSQU5EIChhcmcsIDEpKTsKLSAg ICAgIG1hcmtfdXNlZCAoZm4pOworICAgICAgaWYgKCFtYXJrX3VzZWQgKGZu LCBjb21wbGFpbikgJiYgIShjb21wbGFpbiAmIHRmX2Vycm9yKSkKKwlyZXR1 cm4gZXJyb3JfbWFya19ub2RlOwogCiAgICAgICBpZiAoISBmbGFnX21zX2V4 dGVuc2lvbnMpCiAJewpAQCAtNTU2Myw3ICs1NTY2LDggQEAgY3BfYnVpbGRf YWRkcl9leHByXzEgKHRyZWUgYXJnLCBib29sIHN0cmljdF9sdmFsdWUKIAkg ZnVuY3Rpb24uICAqLwogICAgICAgZ2NjX2Fzc2VydCAoVFJFRV9DT0RFIChm bikgPT0gRlVOQ1RJT05fREVDTAogCQkgICYmIERFQ0xfU1RBVElDX0ZVTkNU SU9OX1AgKGZuKSk7Ci0gICAgICBtYXJrX3VzZWQgKGZuKTsKKyAgICAgIGlm ICghbWFya191c2VkIChmbiwgY29tcGxhaW4pICYmICEoY29tcGxhaW4gJiB0 Zl9lcnJvcikpCisJcmV0dXJuIGVycm9yX21hcmtfbm9kZTsKICAgICAgIHZh bCA9IGJ1aWxkX2FkZHJlc3MgKGZuKTsKICAgICAgIGlmIChUUkVFX1NJREVf RUZGRUNUUyAoVFJFRV9PUEVSQU5EIChhcmcsIDApKSkKIAkvKiBEbyBub3Qg bG9zZSBvYmplY3QncyBzaWRlIGVmZmVjdHMuICAqLwo= --------------090505060002060104080801--