From cfe-commits Tue Aug 25 18:18:59 2015 From: Nathan Wilson via cfe-commits Date: Tue, 25 Aug 2015 18:18:59 +0000 To: cfe-commits Subject: Re: [PATCH] D11789: Modify DeclaratorChuck::getFunction to be passed an Exception Specification Sour Message-Id: X-MARC-Message: https://marc.info/?l=cfe-commits&m=144052674710394 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--b1_e98d7ef706e6233c492da877c904e3b0" --b1_e98d7ef706e6233c492da877c904e3b0 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: quoted-printable nwilson updated this revision to Diff 33093. http://reviews.llvm.org/D11789 Files: include/clang/Basic/DiagnosticSemaKinds.td include/clang/Sema/DeclSpec.h lib/Parse/ParseDecl.cpp lib/Parse/ParseExpr.cpp lib/Parse/ParseExprCXX.cpp lib/Sema/DeclSpec.cpp lib/Sema/SemaDecl.cpp lib/Sema/SemaType.cpp test/SemaCXX/cxx-concept-declaration.cpp --b1_e98d7ef706e6233c492da877c904e3b0 Content-Type: text/x-patch; charset=utf-8; name="D11789.33093.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D11789.33093.patch" SW5kZXg6IHRlc3QvU2VtYUNYWC9jeHgtY29uY2VwdC1kZWNsYXJhdGlvbi5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGVzdC9TZW1hQ1hYL2N4 eC1jb25jZXB0LWRlY2xhcmF0aW9uLmNwcAorKysgdGVzdC9TZW1hQ1hYL2N4 eC1jb25jZXB0LWRlY2xhcmF0aW9uLmNwcApAQCAtMSwxMSArMSwxNCBAQAot Ly8gUlVOOiAgJWNsYW5nX2NjMSAtc3RkPWMrKzE0IC1mY29uY2VwdHMtdHMg LXggYysrIC12ZXJpZnkgJXMKKy8vIFJVTjogICVjbGFuZ19jYzEgLXN0ZD1j KysxNCAtZmNvbmNlcHRzLXRzIC1mY3h4LWV4Y2VwdGlvbnMgLXggYysrIC12 ZXJpZnkgJXMKIAogbmFtZXNwYWNlIEEgewogICB0ZW1wbGF0ZTx0eXBlbmFt ZSBUPiBjb25jZXB0IGJvb2wgQzEoKSB7IHJldHVybiB0cnVlOyB9CiAKICAg dGVtcGxhdGU8dHlwZW5hbWUgVD4gY29uY2VwdCBib29sIEMyID0gdHJ1ZTsK IH0KIAordGVtcGxhdGU8dHlwZW5hbWUgVD4gY29uY2VwdCBib29sIEMzKCkg eyByZXR1cm4gKHRocm93IDAsIHRydWUpOyB9CitzdGF0aWNfYXNzZXJ0KG5v ZXhjZXB0KEMzPGludD4oKSksICJmdW5jdGlvbiBjb25jZXB0IHNob3VsZCBi ZSB0cmVhdGVkIGFzIGlmIG5vZXhjZXB0KHRydWUpIHNwZWNpZmllZCIpOwor CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjb25jZXB0IGJvb2wgRDEoKTsgLy8g ZXhwZWN0ZWQtZXJyb3Ige3tmdW5jdGlvbiBjb25jZXB0IGRlY2xhcmF0aW9u IG11c3QgYmUgYSBkZWZpbml0aW9ufX0KIAogc3RydWN0IEIgewpAQCAtMjMs NiArMjYsOSBAQAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KIGNvbmNlcHQgYm9v bCBENjsgLy8gZXhwZWN0ZWQtZXJyb3Ige3t2YXJpYWJsZSBjb25jZXB0IGRl Y2xhcmF0aW9uIG11c3QgYmUgaW5pdGlhbGl6ZWR9fQogCit0ZW1wbGF0ZTx0 eXBlbmFtZSBUPgorY29uY2VwdCBib29sIEQ3KCkgdGhyb3coaW50KSB7IHJl dHVybiB0cnVlOyB9IC8vIGV4cGVjdGVkLWVycm9yIHt7ZnVuY3Rpb24gY29u Y2VwdCBjYW5ub3QgaGF2ZSBleGNlcHRpb24gc3BlY2lmaWNhdGlvbn19CisK IC8vIFRhZwogY29uY2VwdCBjbGFzcyBDQzEge307IC8vIGV4cGVjdGVkLWVy cm9yIHt7J2NvbmNlcHQnIGNhbiBvbmx5IGFwcGVhciBvbiB0aGUgZGVmaW5p dGlvbiBvZiBhIGZ1bmN0aW9uIHRlbXBsYXRlIG9yIHZhcmlhYmxlIHRlbXBs YXRlfX0KIGNvbmNlcHQgc3RydWN0IENTMSB7fTsgLy8gZXhwZWN0ZWQtZXJy b3Ige3snY29uY2VwdCcgY2FuIG9ubHkgYXBwZWFyIG9uIHRoZSBkZWZpbml0 aW9uIG9mIGEgZnVuY3Rpb24gdGVtcGxhdGUgb3IgdmFyaWFibGUgdGVtcGxh dGV9fQpJbmRleDogbGliL1NlbWEvU2VtYVR5cGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIGxpYi9TZW1hL1NlbWFUeXBlLmNwcAorKysgbGli L1NlbWEvU2VtYVR5cGUuY3BwCkBAIC03MDAsNyArNzAwLDcgQEAKICAgICAg IC8qVm9sYXRpbGVRdWFsaWZpZXJMb2M9Ki9Ob0xvYywKICAgICAgIC8qUmVz dHJpY3RRdWFsaWZpZXJMb2M9Ki9Ob0xvYywKICAgICAgIC8qTXV0YWJsZUxv Yz0qL05vTG9jLCBFU1RfTm9uZSwKLSAgICAgIC8qRVNwZWNMb2M9Ki9Ob0xv YywKKyAgICAgIC8qRVNwZWNSYW5nZT0qL1NvdXJjZVJhbmdlKCksCiAgICAg ICAvKkV4Y2VwdGlvbnM9Ki9udWxscHRyLAogICAgICAgLypFeGNlcHRpb25S YW5nZXM9Ki9udWxscHRyLAogICAgICAgLypOdW1FeGNlcHRpb25zPSovMCwK QEAgLTM4MzMsOSArMzgzMywxMCBAQAogICAgICAgLy8gRXhjZXB0aW9uIHNw ZWNzIGFyZSBub3QgYWxsb3dlZCBpbiB0eXBlZGVmcy4gQ29tcGxhaW4sIGJ1 dCBhZGQgaXQKICAgICAgIC8vIGFueXdheS4KICAgICAgIGlmIChJc1R5cGVk ZWZOYW1lICYmIEZUSS5nZXRFeGNlcHRpb25TcGVjVHlwZSgpKQotICAgICAg ICBTLkRpYWcoRlRJLmdldEV4Y2VwdGlvblNwZWNMb2MoKSwgZGlhZzo6ZXJy X2V4Y2VwdGlvbl9zcGVjX2luX3R5cGVkZWYpCi0gICAgICAgICAgPDwgKEQu Z2V0Q29udGV4dCgpID09IERlY2xhcmF0b3I6OkFsaWFzRGVjbENvbnRleHQg fHwKLSAgICAgICAgICAgICAgRC5nZXRDb250ZXh0KCkgPT0gRGVjbGFyYXRv cjo6QWxpYXNUZW1wbGF0ZUNvbnRleHQpOworICAgICAgICBTLkRpYWcoRlRJ LmdldEV4Y2VwdGlvblNwZWNMb2NCZWcoKSwKKyAgICAgICAgICAgICAgIGRp YWc6OmVycl9leGNlcHRpb25fc3BlY19pbl90eXBlZGVmKQorICAgICAgICAg ICAgPDwgKEQuZ2V0Q29udGV4dCgpID09IERlY2xhcmF0b3I6OkFsaWFzRGVj bENvbnRleHQgfHwKKyAgICAgICAgICAgICAgICBELmdldENvbnRleHQoKSA9 PSBEZWNsYXJhdG9yOjpBbGlhc1RlbXBsYXRlQ29udGV4dCk7CiAKICAgICAg IC8vIElmIHdlIHNlZSAiVCB2YXIoKTsiIG9yICJUIHZhcihUKCkpOyIgYXQg YmxvY2sgc2NvcGUsIGl0IGlzIHByb2JhYmx5CiAgICAgICAvLyBhbiBhdHRl bXB0IHRvIGluaXRpYWxpemUgYSB2YXJpYWJsZSwgbm90IGEgZnVuY3Rpb24g ZGVjbGFyYXRpb24uCkluZGV4OiBsaWIvU2VtYS9TZW1hRGVjbC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gbGliL1NlbWEvU2VtYURlY2wuY3Bw CisrKyBsaWIvU2VtYS9TZW1hRGVjbC5jcHAKQEAgLTc0NzYsNiArNzQ3Niwy MiBAQAogICAgICAgICBOZXdGRC0+c2V0SW52YWxpZERlY2woKTsKICAgICAg IH0KIAorICAgICAgLy8gQysrIENvbmNlcHRzIFRTIFtkY2wuc3BlYy5jb25j ZXB0XXAxOiBbLi4uXSBBIGZ1bmN0aW9uIGNvbmNlcHQgc2hhbGwKKyAgICAg IC8vIGhhdmUgbm8gZXhjZXB0aW9uLXNwZWNpZmljYXRpb24gYW5kIGlzIHRy ZWF0ZWQgYXMgaWYgaXQgd2VyZSBzcGVjaWZpZWQKKyAgICAgIC8vIHdpdGgg bm9leGNlcHQodHJ1ZSkgKDE1LjQpLiBbLi4uXQorICAgICAgaWYgKGNvbnN0 IEZ1bmN0aW9uUHJvdG9UeXBlICpGUFQgPSBSLT5nZXRBczxGdW5jdGlvblBy b3RvVHlwZT4oKSkgeworICAgICAgICBpZiAoRlBULT5oYXNFeGNlcHRpb25T cGVjKCkpIHsKKyAgICAgICAgICBTb3VyY2VSYW5nZSBSYW5nZTsKKyAgICAg ICAgICBpZiAoRC5pc0Z1bmN0aW9uRGVjbGFyYXRvcigpKQorICAgICAgICAg ICAgUmFuZ2UgPSBELmdldEZ1bmN0aW9uVHlwZUluZm8oKS5nZXRFeGNlcHRp b25TcGVjUmFuZ2UoKTsKKyAgICAgICAgICBEaWFnKE5ld0ZELT5nZXRMb2Nh dGlvbigpLCBkaWFnOjplcnJfZnVuY3Rpb25fY29uY2VwdF9leGNlcHRpb25f c3BlYykKKyAgICAgICAgICAgICAgPDwgRml4SXRIaW50OjpDcmVhdGVSZW1v dmFsKFJhbmdlKTsKKyAgICAgICAgICBOZXdGRC0+c2V0SW52YWxpZERlY2wo KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBDb250ZXh0LmFkanVz dEV4Y2VwdGlvblNwZWMoTmV3RkQsIEVTVF9CYXNpY05vZXhjZXB0KTsKKyAg ICAgICAgfQorICAgICAgfQorCiAgICAgICAvLyBDKysgQ29uY2VwdHMgVFMg W2RjbC5zcGVjLmNvbmNlcHRdcDI6IEV2ZXJ5IGNvbmNlcHQgZGVmaW5pdGlv biBpcwogICAgICAgLy8gaW1wbGljaXR5IGRlZmluZWQgdG8gYmUgYSBjb25z dGV4cHIgZGVjbGFyYXRpb24gKGltcGxpY2l0bHkgaW5saW5lKQogICAgICAg TmV3RkQtPnNldEltcGxpY2l0bHlJbmxpbmUoKTsKQEAgLTExMTIzLDcgKzEx MTM5LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8qUmVzdHJpY3RRdWFsaWZpZXJMb2M9Ki9Ob0xvYywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8q TXV0YWJsZUxvYz0qL05vTG9jLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgRVNUX05vbmUsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKkVTcGVjTG9jPSov Tm9Mb2MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAvKkVTcGVjUmFuZ2U9Ki9Tb3VyY2VSYW5nZSgpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLypFeGNl cHRpb25zPSovbnVsbHB0ciwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIC8qRXhjZXB0aW9uUmFuZ2VzPSovbnVsbHB0 ciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8qTnVtRXhjZXB0aW9ucz0qLzAsCkluZGV4OiBsaWIvU2VtYS9EZWNs U3BlYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbGliL1NlbWEv RGVjbFNwZWMuY3BwCisrKyBsaWIvU2VtYS9EZWNsU3BlYy5jcHAKQEAgLTE3 Nyw3ICsxNzcsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgU291cmNlTG9jYXRpb24gTXV0YWJsZUxvYywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEV4 Y2VwdGlvblNwZWNpZmljYXRpb25UeXBlCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRVNwZWNUeXBlLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU291 cmNlTG9jYXRpb24gRVNwZWNMb2MsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBTb3VyY2VSYW5nZSBFU3BlY1Jhbmdl LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgUGFyc2VkVHlwZSAqRXhjZXB0aW9ucywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNvdXJjZVJhbmdlICpFeGNl cHRpb25SYW5nZXMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1bnNpZ25lZCBOdW1FeGNlcHRpb25zLApAQCAtMjEy LDcgKzIxMiw4IEBACiAgIEkuRnVuLlJlc3RyaWN0UXVhbGlmaWVyTG9jICAg ID0gUmVzdHJpY3RRdWFsaWZpZXJMb2MuZ2V0UmF3RW5jb2RpbmcoKTsKICAg SS5GdW4uTXV0YWJsZUxvYyAgICAgICAgICAgICAgPSBNdXRhYmxlTG9jLmdl dFJhd0VuY29kaW5nKCk7CiAgIEkuRnVuLkV4Y2VwdGlvblNwZWNUeXBlICAg ICAgID0gRVNwZWNUeXBlOwotICBJLkZ1bi5FeGNlcHRpb25TcGVjTG9jICAg ICAgICA9IEVTcGVjTG9jLmdldFJhd0VuY29kaW5nKCk7CisgIEkuRnVuLkV4 Y2VwdGlvblNwZWNMb2NCZWcgICAgID0gRVNwZWNSYW5nZS5nZXRCZWdpbigp LmdldFJhd0VuY29kaW5nKCk7CisgIEkuRnVuLkV4Y2VwdGlvblNwZWNMb2NF bmQgICAgID0gRVNwZWNSYW5nZS5nZXRFbmQoKS5nZXRSYXdFbmNvZGluZygp OwogICBJLkZ1bi5OdW1FeGNlcHRpb25zICAgICAgICAgICA9IDA7CiAgIEku RnVuLkV4Y2VwdGlvbnMgICAgICAgICAgICAgID0gbnVsbHB0cjsKICAgSS5G dW4uTm9leGNlcHRFeHByICAgICAgICAgICAgPSBudWxscHRyOwpJbmRleDog bGliL1BhcnNlL1BhcnNlRXhwckNYWC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gbGliL1BhcnNlL1BhcnNlRXhwckNYWC5jcHAKKysrIGxpYi9Q YXJzZS9QYXJzZUV4cHJDWFguY3BwCkBAIC0xMTQ5LDcgKzExNDksNyBAQAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8q Vm9sYXRpbGVRdWFsaWZpZXJMb2M9Ki9Ob0xvYywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKlJlc3RyaWN0UXVhbGlm aWVyTG9jPSovTm9Mb2MsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgTXV0YWJsZUxvYywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBFU3BlY1R5cGUsIEVTcGVjUmFu Z2UuZ2V0QmVnaW4oKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBFU3BlY1R5cGUsIEVTcGVjUmFuZ2UsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRHluYW1pY0V4 Y2VwdGlvbnMuZGF0YSgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIER5bmFtaWNFeGNlcHRpb25SYW5nZXMuZGF0YSgp LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IER5bmFtaWNFeGNlcHRpb25zLnNpemUoKSwKQEAgLTEyMTcsNyArMTIxNyw3 IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8qUmVzdHJpY3RRdWFsaWZpZXJMb2M9Ki9Ob0xvYywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTXV0 YWJsZUxvYywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgRVNUX05vbmUsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC8qRVNwZWNMb2M9Ki9Ob0xvYywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLypFU3BlY1JhbmdlPSovU291cmNlUmFuZ2UoKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLypFeGNlcHRp b25zPSovbnVsbHB0ciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLypFeGNlcHRpb25SYW5nZXM9Ki9udWxscHRy LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvKk51bUV4Y2VwdGlvbnM9Ki8wLApJbmRleDogbGliL1BhcnNlL1Bh cnNlRXhwci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbGliL1Bh cnNlL1BhcnNlRXhwci5jcHAKKysrIGxpYi9QYXJzZS9QYXJzZUV4cHIuY3Bw CkBAIC0yNzY4LDcgKzI3NjgsNyBAQAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgLypSZXN0cmljdFF1YWxpZmllckxv Yz0qL05vTG9jLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgLypNdXRhYmxlTG9jPSovTm9Mb2MsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBFU1RfTm9uZSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IC8qRVNwZWNMb2M9Ki9Ob0xvYywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC8qRVNwZWNSYW5nZT0qL1NvdXJjZVJh bmdlKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAvKkV4Y2VwdGlvbnM9Ki9udWxscHRyLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLypFeGNlcHRpb25S YW5nZXM9Ki9udWxscHRyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLypOdW1FeGNlcHRpb25zPSovMCwKSW5kZXg6 IGxpYi9QYXJzZS9QYXJzZURlY2wuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIGxpYi9QYXJzZS9QYXJzZURlY2wuY3BwCisrKyBsaWIvUGFyc2Uv UGFyc2VEZWNsLmNwcApAQCAtNTYyMCw3ICs1NjIwLDcgQEAKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZvbGF0aWxl UXVhbGlmaWVyTG9jLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUmVzdHJpY3RRdWFsaWZpZXJMb2MsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKk11dGFi bGVMb2M9Ki9Tb3VyY2VMb2NhdGlvbigpLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgRVNwZWNUeXBlLCBFU3BlY1Jh bmdlLmdldEJlZ2luKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBFU3BlY1R5cGUsIEVTcGVjUmFuZ2UsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEeW5h bWljRXhjZXB0aW9ucy5kYXRhKCksCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBEeW5hbWljRXhjZXB0aW9uUmFuZ2Vz LmRhdGEoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIER5bmFtaWNFeGNlcHRpb25zLnNpemUoKSwKSW5kZXg6IGlu Y2x1ZGUvY2xhbmcvU2VtYS9EZWNsU3BlYy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIGluY2x1ZGUvY2xhbmcvU2VtYS9EZWNsU3BlYy5oCisrKyBp bmNsdWRlL2NsYW5nL1NlbWEvRGVjbFNwZWMuaApAQCAtMTI1NSw4ICsxMjU1 LDExIEBACiAgICAgLy8vIGFueS4KICAgICB1bnNpZ25lZCBNdXRhYmxlTG9j OwogCi0gICAgLy8vIFxicmllZiBUaGUgbG9jYXRpb24gb2YgdGhlIGtleXdv cmQgaW50cm9kdWNpbmcgdGhlIHNwZWMsIGlmIGFueS4KLSAgICB1bnNpZ25l ZCBFeGNlcHRpb25TcGVjTG9jOworICAgIC8vLyBcYnJpZWYgVGhlIGJlZ2lu bmluZyBsb2NhdGlvbiBvZiB0aGUgZXhjZXB0aW9uIHNwZWNpZmljYXRpb24s IGlmIGFueS4KKyAgICB1bnNpZ25lZCBFeGNlcHRpb25TcGVjTG9jQmVnOwor CisgICAgLy8vIFxicmllZiBUaGUgZW5kIGxvY2F0aW9uIG9mIHRoZSBleGNl cHRpb24gc3BlY2lmaWNhdGlvbiwgaWYgYW55LgorICAgIHVuc2lnbmVkIEV4 Y2VwdGlvblNwZWNMb2NFbmQ7CiAKICAgICAvLy8gUGFyYW1zIC0gVGhpcyBp cyBhIHBvaW50ZXIgdG8gYSBuZXdbXSdkIGFycmF5IG9mIFBhcmFtSW5mbyBv YmplY3RzIHRoYXQKICAgICAvLy8gZGVzY3JpYmUgdGhlIHBhcmFtZXRlcnMg c3BlY2lmaWVkIGJ5IHRoaXMgZnVuY3Rpb24gZGVjbGFyYXRvci4gIG51bGwg aWYKQEAgLTEzMjMsOCArMTMyNiwxNiBAQAogICAgICAgcmV0dXJuIFNvdXJj ZUxvY2F0aW9uOjpnZXRGcm9tUmF3RW5jb2RpbmcoUlBhcmVuTG9jKTsKICAg ICB9CiAKLSAgICBTb3VyY2VMb2NhdGlvbiBnZXRFeGNlcHRpb25TcGVjTG9j KCkgY29uc3QgewotICAgICAgcmV0dXJuIFNvdXJjZUxvY2F0aW9uOjpnZXRG cm9tUmF3RW5jb2RpbmcoRXhjZXB0aW9uU3BlY0xvYyk7CisgICAgU291cmNl TG9jYXRpb24gZ2V0RXhjZXB0aW9uU3BlY0xvY0JlZygpIGNvbnN0IHsKKyAg ICAgIHJldHVybiBTb3VyY2VMb2NhdGlvbjo6Z2V0RnJvbVJhd0VuY29kaW5n KEV4Y2VwdGlvblNwZWNMb2NCZWcpOworICAgIH0KKworICAgIFNvdXJjZUxv Y2F0aW9uIGdldEV4Y2VwdGlvblNwZWNMb2NFbmQoKSBjb25zdCB7CisgICAg ICByZXR1cm4gU291cmNlTG9jYXRpb246OmdldEZyb21SYXdFbmNvZGluZyhF eGNlcHRpb25TcGVjTG9jRW5kKTsKKyAgICB9CisKKyAgICBTb3VyY2VSYW5n ZSBnZXRFeGNlcHRpb25TcGVjUmFuZ2UoKSBjb25zdCB7CisgICAgICByZXR1 cm4gU291cmNlUmFuZ2UoZ2V0RXhjZXB0aW9uU3BlY0xvY0JlZygpLCBnZXRF eGNlcHRpb25TcGVjTG9jRW5kKCkpOwogICAgIH0KIAogICAgIC8vLyBcYnJp ZWYgUmV0cmlldmUgdGhlIGxvY2F0aW9uIG9mIHRoZSByZWYtcXVhbGlmaWVy LCBpZiBhbnkuCkBAIC0xNDk2LDcgKzE1MDcsNyBAQAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFNvdXJjZUxvY2F0aW9uIFJlc3Ry aWN0UXVhbGlmaWVyTG9jLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFNvdXJjZUxvY2F0aW9uIE11dGFibGVMb2MsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRXhjZXB0aW9uU3BlY2lm aWNhdGlvblR5cGUgRVNwZWNUeXBlLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFNvdXJjZUxvY2F0aW9uIEVTcGVjTG9jLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNvdXJjZVJhbmdl IEVTcGVjUmFuZ2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgUGFyc2VkVHlwZSAqRXhjZXB0aW9ucywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBTb3VyY2VSYW5nZSAqRXhjZXB0aW9u UmFuZ2VzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIE51bUV4Y2VwdGlvbnMsCkluZGV4OiBpbmNsdWRlL2NsYW5n L0Jhc2ljL0RpYWdub3N0aWNTZW1hS2luZHMudGQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gaW5jbHVkZS9jbGFuZy9CYXNpYy9EaWFnbm9zdGljU2Vt YUtpbmRzLnRkCisrKyBpbmNsdWRlL2NsYW5nL0Jhc2ljL0RpYWdub3N0aWNT ZW1hS2luZHMudGQKQEAgLTE5NzcsNiArMTk3Nyw4IEBACiAgICJmdW5jdGlv biBjb25jZXB0IGRlY2xhcmF0aW9uIG11c3QgYmUgYSBkZWZpbml0aW9uIj47 CiBkZWYgZXJyX3Zhcl9jb25jZXB0X25vdF9pbml0aWFsaXplZCA6IEVycm9y PAogICAidmFyaWFibGUgY29uY2VwdCBkZWNsYXJhdGlvbiBtdXN0IGJlIGlu aXRpYWxpemVkIj47CitkZWYgZXJyX2Z1bmN0aW9uX2NvbmNlcHRfZXhjZXB0 aW9uX3NwZWMgOiBFcnJvcjwKKyAgImZ1bmN0aW9uIGNvbmNlcHQgY2Fubm90 IGhhdmUgZXhjZXB0aW9uIHNwZWNpZmljYXRpb24iPjsKIAogLy8gQysrMTEg Y2hhcjE2X3QvY2hhcjMyX3QKIGRlZiB3YXJuX2N4eDk4X2NvbXBhdF91bmlj b2RlX3R5cGUgOiBXYXJuaW5nPAo= --b1_e98d7ef706e6233c492da877c904e3b0 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KY2ZlLWNvbW1p dHMgbWFpbGluZyBsaXN0CmNmZS1jb21taXRzQGxpc3RzLmxsdm0ub3JnCmh0dHA6Ly9saXN0cy5s bHZtLm9yZy9jZ2ktYmluL21haWxtYW4vbGlzdGluZm8vY2ZlLWNvbW1pdHMK --b1_e98d7ef706e6233c492da877c904e3b0--