148443 2015-08-25 13:10:15 -0700 DFG::StrCat isn't really effectful 2015-08-27 17:00:33 -0700 1 1 1 Unclassified WebKit JavaScriptCore Other All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough basile_clement benjamin commit-queue ggaren mark.lam mhahnenb msaboff nrotem oliver saam sam oldest_to_newest 1120695 0 fpizlo 2015-08-25 13:10:15 -0700 Currently clobberize thinks that it is, even though it isn't. 1121422 1 260087 fpizlo 2015-08-27 14:19:40 -0700 Created attachment 260087 the patch 1121423 2 commit-queue 2015-08-27 14:22:28 -0700 Attachment 260087 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:168: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 1121489 3 260087 ggaren 2015-08-27 16:54:41 -0700 Comment on attachment 260087 the patch r=me 1121496 4 fpizlo 2015-08-27 17:00:33 -0700 Landed in http://trac.webkit.org/changeset/189075 260087 2015-08-27 14:19:40 -0700 2015-08-27 16:54:41 -0700 the patch blah.patch text/plain 13883 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg5MDQ4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBA CisyMDE1LTA4LTI3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHOjpTdHJDYXQgaXNuJ3QgcmVhbGx5IGVmZmVjdGZ1bAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NDQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBwcmV2aW91c2x5IG1hZGUgdGhlIERGRyBTdHJD YXQgbm9kZSBlZmZlY3RmdWwgYmVjYXVzZSBpdCBpcyBpbXBsZW1lbnRlZCBieSBjYWxsaW5nIGEK KyAgICAgICAgREZHT3BlcmF0aW9ucyBmdW5jdGlvbiB0aGF0IGNvdWxkIGNhdXNlIGFyYml0cmFy eSBlZmZlY3RzLiBCdXQsIHRoZSBub2RlIGlzIG9ubHkgZ2VuZXJhdGVkIGZyb20gdGhlCisgICAg ICAgIG9wX3N0cmNhdCBieXRlY29kZSBvcGVyYXRpb24sIGFuZCB0aGF0IG9wZXJhdGlvbiBpcyBv bmx5IHVzZWQgd2hlbiB3ZSBmaXJzdCBlbnN1cmUgdGhhdCBpdHMKKyAgICAgICAgb3BlcmFuZHMg YXJlIHByaW1pdGl2ZXMuIFByaW1pdGl2ZSBvcGVyYW5kcyB0byBTdHJDYXQgY2Fubm90IGNhdXNl IGFyYml0cmFyeSBzaWRlLWVmZmVjdHMuIFRoZQorICAgICAgICByZWFzb24gd2h5IEkgZGlkbid0 IGltbWVkaWF0ZWx5IG1hcmsgU3RyQ2F0IGFzIHB1cmUgd2FzIGJlY2F1c2UgdGhlcmUgd2FzIG5v dGhpbmcgaW4gREZHIElSIHRoYXQKKyAgICAgICAgZ3VhcmFudGVlZCB0aGF0IFN0ckNhdCdzIGNo aWxkcmVuIHdlcmUgcHJpbWl0aXZlcy4KKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIGEgS25v d25QcmltaXRpdmVVc2UgdXNlIGtpbmQsIGFuZCBhcHBsaWVzIGl0IHRvIFN0ckNhdC4gVGhpcyBh bGxvd3MgdXMgdG8gbWFyaworICAgICAgICBTdHJDYXQgYXMgYmVpbmcgcHVyZS4gVGhpcyBzaG91 bGQgYmUgYSBzcGVlZC11cCBiZWNhdXNlIHdlIGNhbiBDU0UgU3RyQ2F0IGFuZCBiZWNhdXNlIGl0 IG1lYW5zIHRoYXQKKyAgICAgICAgd2UgY2FuIE9TUiBleGl0IGFmdGVyIGEgU3RyQ2F0IChhIHB1 cmUgbm9kZSBkb2Vzbid0IGNsb2JiZXIgZXhpdCBzdGF0ZSksIHNvIHdlIGNhbiBjb252ZXJ0IG1v cmUKKyAgICAgICAgb2YgYSBsYXJnZSBzdHJpbmcgY29uY2F0ZW5hdGlvbiBpbnRvIE1ha2VSb3Bl J3MuCisKKyAgICAgICAgKiBkZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaDoKKyAg ICAgICAgKEpTQzo6REZHOjpBYnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeXBlPjo6 ZXhlY3V0ZUVmZmVjdHMpOgorICAgICAgICAqIGRmZy9ERkdDbG9iYmVyaXplLmg6CisgICAgICAg IChKU0M6OkRGRzo6Y2xvYmJlcml6ZSk6CisgICAgICAgICogZGZnL0RGR0ZpeHVwUGhhc2UuY3Bw OgorICAgICAgICAoSlNDOjpERkc6OkZpeHVwUGhhc2U6OmZpeHVwTm9kZSk6CisgICAgICAgIChK U0M6OkRGRzo6Rml4dXBQaGFzZTo6YXR0ZW1wdFRvTWFrZUZhc3RTdHJpbmdBZGQpOgorICAgICAg ICAqIGRmZy9ERkdPcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKiBkZmcvREZHU2FmZVRvRXhlY3V0 ZS5oOgorICAgICAgICAoSlNDOjpERkc6OlNhZmVUb0V4ZWN1dGVFZGdlOjpvcGVyYXRvcigpKToK KyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpERkc6 OlNwZWN1bGF0aXZlSklUOjpzcGVjdWxhdGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2 ZUpJVDMyXzY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGls ZSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwOgorICAgICAgICAoSlND OjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlKToKKyAgICAgICAgKiBkZmcvREZHVXNlS2lu ZC5jcHA6CisgICAgICAgIChXVEY6OnByaW50SW50ZXJuYWwpOgorICAgICAgICAqIGRmZy9ERkdV c2VLaW5kLmg6CisgICAgICAgIChKU0M6OkRGRzo6dHlwZUZpbHRlckZvcik6CisgICAgICAgIChK U0M6OkRGRzo6c2hvdWxkTm90SGF2ZVR5cGVDaGVjayk6CisgICAgICAgICogZnRsL0ZUTENhcGFi aWxpdGllcy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6Y2FuQ29tcGlsZSk6CisgICAgICAgICog ZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2Vy REZHVG9MTFZNOjpjb21waWxlU3RyQ2F0KToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2Vy REZHVG9MTFZNOjpzcGVjdWxhdGUpOgorCiAyMDE1LTA4LTI3ICBGaWxpcCBQaXpsbyAgPGZwaXps b0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYWRkIGEgY29tbWVudCB0byBkZXNj cmliZSBzb21ldGhpbmcgSSBsZWFybmVkIGFib3V0IGEgY29uZnVzaW5nbHktbmFtZWQgZnVuY3Rp b24uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0 ZXJJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdB YnN0cmFjdEludGVycHJldGVySW5saW5lcy5oCShyZXZpc2lvbiAxODkwMzgpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHdvcmtp bmcgY29weSkKQEAgLTQyMCw3ICs0MjAsNiBAQCBib29sIEFic3RyYWN0SW50ZXJwcmV0ZXI8QWJz dHJhY3RTdGF0ZVR5CiAgICAgfQogCiAgICAgY2FzZSBTdHJDYXQ6IHsKLSAgICAgICAgY2xvYmJl cldvcmxkKG5vZGUtPm9yaWdpbi5zZW1hbnRpYywgY2xvYmJlckxpbWl0KTsKICAgICAgICAgZm9y Tm9kZShub2RlKS5zZXRUeXBlKG1fZ3JhcGgsIFNwZWNTdHJpbmcpOwogICAgICAgICBicmVhazsK ICAgICB9CkBAIC0xNTc1LDcgKzE1NzQsNyBAQCBib29sIEFic3RyYWN0SW50ZXJwcmV0ZXI8QWJz dHJhY3RTdGF0ZVR5CiAgICAgICAgIAogICAgICAgICBjbG9iYmVyV29ybGQobm9kZS0+b3JpZ2lu LnNlbWFudGljLCBjbG9iYmVyTGltaXQpOwogICAgICAgICAKLSAgICAgICAgZm9yTm9kZShub2Rl KS5zZXRUeXBlKG1fZ3JhcGgsIChTcGVjSGVhcFRvcCAmIH5TcGVjQ2VsbCkgfCBTcGVjU3RyaW5n IHwgU3BlY1N5bWJvbCk7CisgICAgICAgIGZvck5vZGUobm9kZSkuc2V0VHlwZShtX2dyYXBoLCBT cGVjSGVhcFRvcCAmIH5TcGVjT2JqZWN0KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgICAg ICAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2xvYmJlcml6ZS5oCShyZXZp c2lvbiAxODkwMzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUu aAkod29ya2luZyBjb3B5KQpAQCAtMTU3LDYgKzE1Nyw3IEBAIHZvaWQgY2xvYmJlcml6ZShHcmFw aCYgZ3JhcGgsIE5vZGUqIG5vZGUKICAgICBjYXNlIEJvb2xlYW5Ub051bWJlcjoKICAgICBjYXNl IEZpYXRJbnQ1MjoKICAgICBjYXNlIE1ha2VSb3BlOgorICAgIGNhc2UgU3RyQ2F0OgogICAgIGNh c2UgVmFsdWVUb0ludDMyOgogICAgIGNhc2UgR2V0RXhlY3V0YWJsZToKICAgICBjYXNlIEJvdHRv bVZhbHVlOgpAQCAtMzkzLDE1ICszOTQsNiBAQCB2b2lkIGNsb2JiZXJpemUoR3JhcGgmIGdyYXBo LCBOb2RlKiBub2RlCiAgICAgICAgIHdyaXRlKEhlYXApOwogICAgICAgICByZXR1cm47CiAgICAg ICAgIAotICAgIGNhc2UgU3RyQ2F0OgotICAgICAgICAvLyBUaGlzIGlzIHByZXR0eSB3ZWlyZC4g SW4gZmFjdCwgU3RyQ2F0IGhhcyB2ZXJ5IGxpbWl0ZWQgZWZmZWN0ZnVsbmVzcyBiZWNhdXNlIHdl IG9ubHkKLSAgICAgICAgLy8gcGFzcyBpdCBwcmltaXRpdmUgdmFsdWVzLiBCdXQsIHJpZ2h0IG5v dywgdGhlIGNvbXBpbGVyIGlzbid0IHNtYXJ0IGVub3VnaCB0byBrbm93IHRoaXMKLSAgICAgICAg Ly8gYW5kIHRoYXQncyBwcm9iYWJseSBPSy4KLSAgICAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg0NDMKLSAgICAgICAgcmVhZChXb3JsZCk7 Ci0gICAgICAgIHdyaXRlKEhlYXApOwotICAgICAgICByZXR1cm47Ci0KICAgICBjYXNlIEdldEdl dHRlcjoKICAgICAgICAgcmVhZChHZXR0ZXJTZXR0ZXJfZ2V0dGVyKTsKICAgICAgICAgZGVmKEhl YXBMb2NhdGlvbihHZXR0ZXJMb2MsIEdldHRlclNldHRlcl9nZXR0ZXIsIG5vZGUtPmNoaWxkMSgp KSwgTGF6eU5vZGUobm9kZSkpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdG aXh1cFBoYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0ZpeHVwUGhhc2UuY3BwCShyZXZpc2lvbiAxODkwMzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjAsNyArMTYwLDE0 IEBAIHByaXZhdGU6CiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIFN0ckNhdDogewotICAgICAg ICAgICAgYXR0ZW1wdFRvTWFrZUZhc3RTdHJpbmdBZGQobm9kZSk7CisgICAgICAgICAgICBpZiAo YXR0ZW1wdFRvTWFrZUZhc3RTdHJpbmdBZGQobm9kZSkpCisgICAgICAgICAgICAgICAgYnJlYWs7 CisKKyAgICAgICAgICAgIG1fZ3JhcGguZG9Ub0NoaWxkcmVuKAorICAgICAgICAgICAgICAgIG5v ZGUsCisgICAgICAgICAgICAgICAgWyZdIChFZGdlJiBlZGdlKSB7CisgICAgICAgICAgICAgICAg ICAgIGZpeEVkZ2U8S25vd25QcmltaXRpdmVVc2U+KGVkZ2UpOworICAgICAgICAgICAgICAgIH0p OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIApAQCAtMTUxMCwx NCArMTUxNyw2IEBAIHByaXZhdGU6CiAKICAgICBib29sIGF0dGVtcHRUb01ha2VGYXN0U3RyaW5n QWRkKE5vZGUqIG5vZGUpCiAgICAgewotICAgICAgICBpZiAoIW5vZGUtPm9yaWdpbi5leGl0T0sp IHsKLSAgICAgICAgICAgIC8vIElmIHRoaXMgY29kZSBjYW5ub3QgZXhpdCwgdGhlbiB3ZSBzaG91 bGQgbm90IGNvbnZlcnQgaXQgdG8gYSBNYWtlUm9wZSwgc2luY2UgTWFrZVJvcGUKLSAgICAgICAg ICAgIC8vIGNhbiBleGl0LiBUaGlzIGFyaXNlcyBiZWNhdXNlIHdlIHRoaW5rIHRoYXQgU3RyQ2F0 IGNsb2JiZXJzIGV4aXQgc3RhdGUsIGV2ZW4gdGhvdWdoIGl0Ci0gICAgICAgICAgICAvLyBkb2Vz bid0IHJlYWxseSBkbyB0aGF0LgotICAgICAgICAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg0NDMKLSAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICAgICAgfQotICAgICAgICAKICAgICAgICAgYm9vbCBnb29kVG9HbyA9IHRydWU7CiAg ICAgICAgIG1fZ3JhcGguZG9Ub0NoaWxkcmVuKAogICAgICAgICAgICAgbm9kZSwKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAkocmV2aXNpb24gMTg5 MDM4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTExNCwxMSArMTExNCw5IEBAIEpTQ2VsbCogSklUX09QRVJBVElPTiBv cGVyYXRpb25TdHJDYXQyKEUKICAgICBOYXRpdmVDYWxsRnJhbWVUcmFjZXIgdHJhY2VyKCZ2bSwg ZXhlYyk7CiAKICAgICBKU1N0cmluZyogc3RyMSA9IEpTVmFsdWU6OmRlY29kZShhKS50b1N0cmlu ZyhleGVjKTsKLSAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCi0gICAgICAgIHJldHVybiBu dWxscHRyOworICAgIEFTU0VSVCghZXhlYy0+aGFkRXhjZXB0aW9uKCkpOyAvLyBJbXBvc3NpYmxl LCBzaW5jZSB3ZSBtdXN0IGhhdmUgYmVlbiBnaXZlbiBwcmltaXRpdmVzLgogICAgIEpTU3RyaW5n KiBzdHIyID0gSlNWYWx1ZTo6ZGVjb2RlKGIpLnRvU3RyaW5nKGV4ZWMpOwotICAgIGlmIChleGVj LT5oYWRFeGNlcHRpb24oKSkKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgQVNTRVJUKCFl eGVjLT5oYWRFeGNlcHRpb24oKSk7CiAKICAgICBpZiAoc3VtT3ZlcmZsb3dzPGludDMyX3Q+KHN0 cjEtPmxlbmd0aCgpLCBzdHIyLT5sZW5ndGgoKSkpIHsKICAgICAgICAgdGhyb3dPdXRPZk1lbW9y eUVycm9yKGV4ZWMpOwpAQCAtMTEzNCwxNCArMTEzMiwxMSBAQCBKU0NlbGwqIEpJVF9PUEVSQVRJ T04gb3BlcmF0aW9uU3RyQ2F0MyhFCiAgICAgTmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNlcigm dm0sIGV4ZWMpOwogCiAgICAgSlNTdHJpbmcqIHN0cjEgPSBKU1ZhbHVlOjpkZWNvZGUoYSkudG9T dHJpbmcoZXhlYyk7Ci0gICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQotICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKyAgICBBU1NFUlQoIWV4ZWMtPmhhZEV4Y2VwdGlvbigpKTsgLy8gSW1wb3Nz aWJsZSwgc2luY2Ugd2UgbXVzdCBoYXZlIGJlZW4gZ2l2ZW4gcHJpbWl0aXZlcy4KICAgICBKU1N0 cmluZyogc3RyMiA9IEpTVmFsdWU6OmRlY29kZShiKS50b1N0cmluZyhleGVjKTsKLSAgICBpZiAo ZXhlYy0+aGFkRXhjZXB0aW9uKCkpCi0gICAgICAgIHJldHVybiBudWxscHRyOworICAgIEFTU0VS VCghZXhlYy0+aGFkRXhjZXB0aW9uKCkpOwogICAgIEpTU3RyaW5nKiBzdHIzID0gSlNWYWx1ZTo6 ZGVjb2RlKGMpLnRvU3RyaW5nKGV4ZWMpOwotICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkK LSAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgQVNTRVJUKCFleGVjLT5oYWRFeGNlcHRpb24o KSk7CiAKICAgICBpZiAoc3VtT3ZlcmZsb3dzPGludDMyX3Q+KHN0cjEtPmxlbmd0aCgpLCBzdHIy LT5sZW5ndGgoKSwgc3RyMy0+bGVuZ3RoKCkpKSB7CiAgICAgICAgIHRocm93T3V0T2ZNZW1vcnlF cnJvcihleGVjKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2FmZVRvRXhl Y3V0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2FmZVRv RXhlY3V0ZS5oCShyZXZpc2lvbiAxODkwMzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1NhZmVUb0V4ZWN1dGUuaAkod29ya2luZyBjb3B5KQpAQCAtODksNiArODksMTEgQEAgcHVi bGljOgogICAgICAgICAgICAgaWYgKG1fc3RhdGUuZm9yTm9kZShlZGdlKS5tX3R5cGUgJiB+U3Bl Y1N0cmluZykKICAgICAgICAgICAgICAgICBtX3Jlc3VsdCA9IGZhbHNlOwogICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIGNhc2UgS25vd25QcmltaXRpdmVVc2U6CisgICAgICAgICAgICBp ZiAobV9zdGF0ZS5mb3JOb2RlKGVkZ2UpLm1fdHlwZSAmIH4oU3BlY0hlYXBUb3AgJiB+U3BlY09i amVjdCkpCisgICAgICAgICAgICAgICAgbV9yZXN1bHQgPSBmYWxzZTsKKyAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIAogICAgICAgICBjYXNlIExhc3RVc2VLaW5kOgogICAgICAgICAg ICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAkocmV2aXNpb24g MTg5MDM4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMy XzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA2Myw5ICsyMDYzLDkgQEAgdm9pZCBTcGVjdWxh dGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgIH0KIAogICAgIGNhc2UgU3RyQ2F0OiB7 Ci0gICAgICAgIEpTVmFsdWVPcGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0gICAg ICAgIEpTVmFsdWVPcGVyYW5kIG9wMih0aGlzLCBub2RlLT5jaGlsZDIoKSk7Ci0gICAgICAgIEpT VmFsdWVPcGVyYW5kIG9wMyh0aGlzLCBub2RlLT5jaGlsZDMoKSk7CisgICAgICAgIEpTVmFsdWVP cGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9u KTsKKyAgICAgICAgSlNWYWx1ZU9wZXJhbmQgb3AyKHRoaXMsIG5vZGUtPmNoaWxkMigpLCBNYW51 YWxPcGVyYW5kU3BlY3VsYXRpb24pOworICAgICAgICBKU1ZhbHVlT3BlcmFuZCBvcDModGhpcywg bm9kZS0+Y2hpbGQzKCksIE1hbnVhbE9wZXJhbmRTcGVjdWxhdGlvbik7CiAgICAgICAgIAogICAg ICAgICBHUFJSZWcgb3AxVGFnR1BSID0gb3AxLnRhZ0dQUigpOwogICAgICAgICBHUFJSZWcgb3Ax UGF5bG9hZEdQUiA9IG9wMS5wYXlsb2FkR1BSKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHJldmlzaW9uIDE4OTAzOCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIxOTUsOSArMjE5NSw5IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNv bXBpbGUoTm9kZSogbm9kZSkKICAgICB9CiAgICAgICAgIAogICAgIGNhc2UgU3RyQ2F0OiB7Ci0g ICAgICAgIEpTVmFsdWVPcGVyYW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAg IEpTVmFsdWVPcGVyYW5kIG9wMih0aGlzLCBub2RlLT5jaGlsZDIoKSk7Ci0gICAgICAgIEpTVmFs dWVPcGVyYW5kIG9wMyh0aGlzLCBub2RlLT5jaGlsZDMoKSk7CisgICAgICAgIEpTVmFsdWVPcGVy YW5kIG9wMSh0aGlzLCBub2RlLT5jaGlsZDEoKSwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9uKTsK KyAgICAgICAgSlNWYWx1ZU9wZXJhbmQgb3AyKHRoaXMsIG5vZGUtPmNoaWxkMigpLCBNYW51YWxP cGVyYW5kU3BlY3VsYXRpb24pOworICAgICAgICBKU1ZhbHVlT3BlcmFuZCBvcDModGhpcywgbm9k ZS0+Y2hpbGQzKCksIE1hbnVhbE9wZXJhbmRTcGVjdWxhdGlvbik7CiAgICAgICAgIAogICAgICAg ICBHUFJSZWcgb3AxR1BSID0gb3AxLmdwcigpOwogICAgICAgICBHUFJSZWcgb3AyR1BSID0gb3Ay LmdwcigpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJ VC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxh dGl2ZUpJVC5jcHAJKHJldmlzaW9uIDE4OTAzOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01ODgxLDYgKzU4ODEs OSBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpzcGVjdWxhdGUoTm9kZSosIEVkCiAgICAgY2FzZSBL bm93blN0cmluZ1VzZToKICAgICAgICAgQVNTRVJUKCFuZWVkc1R5cGVDaGVjayhlZGdlLCBTcGVj U3RyaW5nKSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgS25vd25QcmltaXRpdmVVc2U6Cisg ICAgICAgIEFTU0VSVCghbmVlZHNUeXBlQ2hlY2soZWRnZSwgU3BlY0hlYXBUb3AgJiB+U3BlY09i amVjdCkpOworICAgICAgICBicmVhazsKICAgICBjYXNlIEludDMyVXNlOgogICAgICAgICBzcGVj dWxhdGVJbnQzMihlZGdlKTsKICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1VzZUtpbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHVXNlS2luZC5jcHAJKHJldmlzaW9uIDE4OTAzOCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHVXNlS2luZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw2ICsx MDAsOSBAQCB2b2lkIHByaW50SW50ZXJuYWwoUHJpbnRTdHJlYW0mIG91dCwgVXNlCiAgICAgY2Fz ZSBLbm93blN0cmluZ1VzZToKICAgICAgICAgb3V0LnByaW50KCJLbm93blN0cmluZyIpOwogICAg ICAgICByZXR1cm47CisgICAgY2FzZSBLbm93blByaW1pdGl2ZVVzZToKKyAgICAgICAgb3V0LnBy aW50KCJLbm93blByaW1pdGl2ZSIpOworICAgICAgICByZXR1cm47CiAgICAgY2FzZSBTeW1ib2xV c2U6CiAgICAgICAgIG91dC5wcmludCgiU3ltYm9sIik7CiAgICAgICAgIHJldHVybjsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHVXNlS2luZC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHVXNlS2luZC5oCShyZXZpc2lvbiAxODkwMzgpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1VzZUtpbmQuaAkod29ya2luZyBjb3B5KQpA QCAtNTgsNiArNTgsNyBAQCBlbnVtIFVzZUtpbmQgewogICAgIFN0cmluZ0lkZW50VXNlLAogICAg IFN0cmluZ1VzZSwKICAgICBLbm93blN0cmluZ1VzZSwKKyAgICBLbm93blByaW1pdGl2ZVVzZSwg Ly8gVGhpcyBiaXphcnJlIHR5cGUgYXJpc2VzIGZvciBvcF9zdHJjYXQsIHdoaWNoIGhhcyBhIGJ5 dGVjb2RlIGd1YXJhbnRlZSB0aGF0IGl0IHdpbGwgb25seSBzZWUgcHJpbWl0aXZlcyAoaS5lLiBu b3Qgb2JqZWN0cykuCiAgICAgU3ltYm9sVXNlLAogICAgIFN0cmluZ09iamVjdFVzZSwKICAgICBT dHJpbmdPclN0cmluZ09iamVjdFVzZSwKQEAgLTEyMCw2ICsxMjEsOCBAQCBpbmxpbmUgU3BlY3Vs YXRlZFR5cGUgdHlwZUZpbHRlckZvcihVc2VLCiAgICAgY2FzZSBTdHJpbmdVc2U6CiAgICAgY2Fz ZSBLbm93blN0cmluZ1VzZToKICAgICAgICAgcmV0dXJuIFNwZWNTdHJpbmc7CisgICAgY2FzZSBL bm93blByaW1pdGl2ZVVzZToKKyAgICAgICAgcmV0dXJuIFNwZWNIZWFwVG9wICYgflNwZWNPYmpl Y3Q7CiAgICAgY2FzZSBTeW1ib2xVc2U6CiAgICAgICAgIHJldHVybiBTcGVjU3ltYm9sOwogICAg IGNhc2UgU3RyaW5nT2JqZWN0VXNlOgpAQCAtMTQ3LDYgKzE1MCw3IEBAIGlubGluZSBib29sIHNo b3VsZE5vdEhhdmVUeXBlQ2hlY2soVXNlS2kKICAgICBjYXNlIEtub3duSW50MzJVc2U6CiAgICAg Y2FzZSBLbm93bkNlbGxVc2U6CiAgICAgY2FzZSBLbm93blN0cmluZ1VzZToKKyAgICBjYXNlIEtu b3duUHJpbWl0aXZlVXNlOgogICAgIGNhc2UgS25vd25Cb29sZWFuVXNlOgogICAgIGNhc2UgSW50 NTJSZXBVc2U6CiAgICAgY2FzZSBEb3VibGVSZXBVc2U6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZnRsL0ZUTENhcGFiaWxpdGllcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2Z0bC9GVExDYXBhYmlsaXRpZXMuY3BwCShyZXZpc2lvbiAxODkwMzgpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTENhcGFiaWxpdGllcy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQyMiw2ICs0MjIsNyBAQCBDYXBhYmlsaXR5TGV2ZWwgY2FuQ29tcGlsZShHcmFwaCYg Z3JhcGgpCiAgICAgICAgICAgICAgICAgY2FzZSBPYmplY3RPck90aGVyVXNlOgogICAgICAgICAg ICAgICAgIGNhc2UgU3RyaW5nVXNlOgogICAgICAgICAgICAgICAgIGNhc2UgS25vd25TdHJpbmdV c2U6CisgICAgICAgICAgICAgICAgY2FzZSBLbm93blByaW1pdGl2ZVVzZToKICAgICAgICAgICAg ICAgICBjYXNlIFN0cmluZ09iamVjdFVzZToKICAgICAgICAgICAgICAgICBjYXNlIFN0cmluZ09y U3RyaW5nT2JqZWN0VXNlOgogICAgICAgICAgICAgICAgIGNhc2UgU3ltYm9sVXNlOgpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAJKHJl dmlzaW9uIDE4OTAzOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdU b0xMVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzI2LDEyICsxMzI2LDE0IEBAIHByaXZhdGU6 CiAgICAgICAgIGlmIChtX25vZGUtPmNoaWxkMygpKSB7CiAgICAgICAgICAgICByZXN1bHQgPSB2 bUNhbGwoCiAgICAgICAgICAgICAgICAgbV9vdXQub3BlcmF0aW9uKG9wZXJhdGlvblN0ckNhdDMp LCBtX2NhbGxGcmFtZSwKLSAgICAgICAgICAgICAgICBsb3dKU1ZhbHVlKG1fbm9kZS0+Y2hpbGQx KCkpLCBsb3dKU1ZhbHVlKG1fbm9kZS0+Y2hpbGQyKCkpLAotICAgICAgICAgICAgICAgIGxvd0pT VmFsdWUobV9ub2RlLT5jaGlsZDMoKSkpOworICAgICAgICAgICAgICAgIGxvd0pTVmFsdWUobV9u b2RlLT5jaGlsZDEoKSwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9uKSwKKyAgICAgICAgICAgICAg ICBsb3dKU1ZhbHVlKG1fbm9kZS0+Y2hpbGQyKCksIE1hbnVhbE9wZXJhbmRTcGVjdWxhdGlvbiks CisgICAgICAgICAgICAgICAgbG93SlNWYWx1ZShtX25vZGUtPmNoaWxkMygpLCBNYW51YWxPcGVy YW5kU3BlY3VsYXRpb24pKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHJlc3VsdCA9 IHZtQ2FsbCgKICAgICAgICAgICAgICAgICBtX291dC5vcGVyYXRpb24ob3BlcmF0aW9uU3RyQ2F0 MiksIG1fY2FsbEZyYW1lLAotICAgICAgICAgICAgICAgIGxvd0pTVmFsdWUobV9ub2RlLT5jaGls ZDEoKSksIGxvd0pTVmFsdWUobV9ub2RlLT5jaGlsZDIoKSkpOworICAgICAgICAgICAgICAgIGxv d0pTVmFsdWUobV9ub2RlLT5jaGlsZDEoKSwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9uKSwKKyAg ICAgICAgICAgICAgICBsb3dKU1ZhbHVlKG1fbm9kZS0+Y2hpbGQyKCksIE1hbnVhbE9wZXJhbmRT cGVjdWxhdGlvbikpOwogICAgICAgICB9CiAgICAgICAgIHNldEpTVmFsdWUocmVzdWx0KTsKICAg ICB9CkBAIC03NDk1LDYgKzc0OTcsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGNhc2UgS25vd25JbnQzMlVzZToKICAgICAgICAgY2FzZSBLbm93blN0cmluZ1VzZToK KyAgICAgICAgY2FzZSBLbm93blByaW1pdGl2ZVVzZToKICAgICAgICAgY2FzZSBEb3VibGVSZXBV c2U6CiAgICAgICAgIGNhc2UgSW50NTJSZXBVc2U6CiAgICAgICAgICAgICBBU1NFUlQoIW1faW50 ZXJwcmV0ZXIubmVlZHNUeXBlQ2hlY2soZWRnZSkpOwo=