129160 2014-02-21 12:13:49 -0800 DFG write barriers should do more speculations 2015-05-14 12:29:03 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 1 fpizlo mhahnenberg barraclough ggaren mark.lam mhahnenberg mmirman msaboff nrotem oliver ossy rniwa sam oldest_to_newest 983284 0 fpizlo 2014-02-21 12:13:49 -0800 Patch forthcoming. 983285 1 224888 fpizlo 2014-02-21 12:15:36 -0800 Created attachment 224888 the patch 983289 2 224888 mhahnenberg 2014-02-21 12:23:56 -0800 Comment on attachment 224888 the patch r=me 983293 3 fpizlo 2014-02-21 12:32:18 -0800 Landed in http://trac.webkit.org/changeset/164493 984031 4 rniwa 2014-02-24 13:23:50 -0800 Looks like this patch caused/revealed a crash on DYEBench. 984357 5 fpizlo 2014-02-25 09:37:56 -0800 It's causing crashes. 984366 6 fpizlo 2014-02-25 09:43:24 -0800 Landed in http://trac.webkit.org/changeset/164651 984722 7 ossy 2014-02-26 06:12:16 -0800 (In reply to comment #3) > Landed in http://trac.webkit.org/changeset/164493 just to note: It caused this bug - https://bugs.webkit.org/show_bug.cgi?id=129247 (which appeared after rolling out) 1094870 8 fpizlo 2015-05-14 12:29:03 -0700 We landed something like this a whiel ago. 224888 2014-02-21 12:15:36 -0800 2014-02-21 12:23:56 -0800 the patch blah.patch text/plain 11241 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0NDkxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBA CisyMDE0LTAyLTIxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIHdyaXRlIGJhcnJpZXJzIHNob3VsZCBkbyBtb3JlIHNwZWN1bGF0aW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MTYwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZXBsYWNlIENv bmRpdGlvbmFsU3RvcmVCYXJyaWVyIHdpdGggdGhlIGNoZWFwZXN0IHNwZWN1bGF0aW9uIHRoYXQg eW91IGNvdWxkIGRvCisgICAgICAgIGluc3RlYWQuCisgICAgICAgIAorICAgICAgICBNaW5pc2N1 bGUgc3BlZWQtdXAgb24gc29tZSB0aGluZ3MuIEl0J3MgYSBkZWNlbnQgZGlmZmVyZW5jZSBpbiBj b2RlIHNpemUsIHRob3VnaC4KKworICAgICAgICAqIGJ5dGVjb2RlL1NwZWN1bGF0ZWRUeXBlLmNw cDoKKyAgICAgICAgKEpTQzo6c3BlY3VsYXRpb25Ub0FiYnJldmlhdGVkU3RyaW5nKToKKyAgICAg ICAgKiBieXRlY29kZS9TcGVjdWxhdGVkVHlwZS5oOgorICAgICAgICAoSlNDOjppc05vdENlbGxT cGVjdWxhdGlvbik6CisgICAgICAgICogZGZnL0RGR0ZpeHVwUGhhc2UuY3BwOgorICAgICAgICAo SlNDOjpERkc6OkZpeHVwUGhhc2U6OmZpeHVwTm9kZSk6CisgICAgICAgIChKU0M6OkRGRzo6Rml4 dXBQaGFzZTo6aW5zZXJ0U3RvcmVCYXJyaWVyKToKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBo YXNlOjppbnNlcnRQaGFudG9tQ2hlY2spOgorICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAg ICAgIChKU0M6OkRGRzo6Tm9kZTo6c2hvdWxkU3BlY3VsYXRlT3RoZXIpOgorICAgICAgICAoSlND OjpERkc6Ok5vZGU6OnNob3VsZFNwZWN1bGF0ZU5vdENlbGwpOgorICAgICAgICAqIGZ0bC9GVExD YXBhYmlsaXRpZXMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OmNhbkNvbXBpbGUpOgorICAgICAg ICAqIGZ0bC9GVExMb3dlckRGR1RvTExWTS5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6TG93ZXJE RkdUb0xMVk06OmNvbXBhcmVFcU9iamVjdE9yT3RoZXJUb09iamVjdCk6CisgICAgICAgIChKU0M6 OkZUTDo6TG93ZXJERkdUb0xMVk06OmVxdWFsTnVsbE9yVW5kZWZpbmVkKToKKyAgICAgICAgKEpT Qzo6RlRMOjpMb3dlckRGR1RvTExWTTo6aXNOb3RPdGhlcik6CisgICAgICAgIChKU0M6OkZUTDo6 TG93ZXJERkdUb0xMVk06OmlzT3RoZXIpOgorICAgICAgICAoSlNDOjpGVEw6Okxvd2VyREZHVG9M TFZNOjpzcGVjdWxhdGUpOgorICAgICAgICAoSlNDOjpGVEw6Okxvd2VyREZHVG9MTFZNOjpzcGVj dWxhdGVPYmplY3RPck90aGVyKToKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRGR1RvTExWTTo6 c3BlY3VsYXRlT3RoZXIpOgorICAgICAgICAoSlNDOjpGVEw6Okxvd2VyREZHVG9MTFZNOjpzcGVj dWxhdGVOb3RDZWxsKToKKwogMjAxNC0wMi0yMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgogCiAgICAgICAgIFJldmVydCByMTY0NDg2LCBjYXVzaW5nIGEgbnVtYmVyIG9m IHRlc3QgZmFpbHVyZXMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3Bl Y3VsYXRlZFR5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9TcGVjdWxhdGVkVHlwZS5jcHAJKHJldmlzaW9uIDE2NDQ2NSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9TcGVjdWxhdGVkVHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDEyLCAyMDEzIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiwg MjAxMywgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTI1NSw2ICsyNTUsOCBAQCBzdGF0aWMgY29uc3QgY2hhciog c3BlY3VsYXRpb25Ub0FiYnJldmlhCiAgICAgICAgIHJldHVybiAiPEJvb2xlYW4+IjsKICAgICBp ZiAoaXNPdGhlclNwZWN1bGF0aW9uKHByZWRpY3Rpb24pKQogICAgICAgICByZXR1cm4gIjxPdGhl cj4iOworICAgIGlmIChpc05vdENlbGxTcGVjdWxhdGlvbihwcmVkaWN0aW9uKSkKKyAgICAgICAg cmV0dXJuICI8Tm90Q2VsbD4iOwogICAgIHJldHVybiAiIjsKIH0KIApJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NwZWN1bGF0ZWRUeXBlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NwZWN1bGF0ZWRUeXBlLmgJKHJldmlzaW9uIDE2 NDQ2NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TcGVjdWxhdGVkVHlwZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAx MSwgMjAxMiwgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTEsIDIwMTIsIDIwMTMsIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zNDAsNiArMzQwLDExIEBA IGlubGluZSBib29sIGlzT3RoZXJPckVtcHR5U3BlY3VsYXRpb24oU3AKICAgICByZXR1cm4gIXZh bHVlIHx8IHZhbHVlID09IFNwZWNPdGhlcjsKIH0KIAoraW5saW5lIGJvb2wgaXNOb3RDZWxsU3Bl Y3VsYXRpb24oU3BlY3VsYXRlZFR5cGUgdmFsdWUpCit7CisgICAgcmV0dXJuICEhdmFsdWUgJiYg ISh2YWx1ZSAmIFNwZWNDZWxsKTsKK30KKwogaW5saW5lIGJvb2wgaXNFbXB0eVNwZWN1bGF0aW9u KFNwZWN1bGF0ZWRUeXBlIHZhbHVlKQogewogICAgIHJldHVybiB2YWx1ZSA9PSBTcGVjRW1wdHk7 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJKHJl dmlzaW9uIDE2NDQ2NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFz ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNTYsMTEgKzEwNTYsNiBAQCBwcml2YXRlOgogICAg ICAgICAgICAgLy8gRklYTUU6IEdldCByaWQgb2YgdGhpcyBieSBhbGxvd2luZyBQaGFudG9tcyBh ZnRlciB0ZXJtaW5hbHMuCiAgICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI2Nzc4CiAgICAgICAgICAgICBtX3JlcXVpcmVkUGhhbnRvbXMucmVz aXplKDApOwotICAgICAgICAvLyBTaW5jZSBTdG9yZUJhcnJpZXJzIGFyZSByZWN1cnNpdmVseSBm aXhlZCB1cCBzbyB0aGF0IHRoZWlyIGNoaWxkcmVuIGxvb2sgCi0gICAgICAgIC8vIGlkZW50aWNh bCB0byB0aGF0IG9mIHRoZSBub2RlIHRoZXkncmUgYmFycmllci1pbmcsIHdlIG5lZWQgdG8gYXZv aWQgYWRkaW5nCi0gICAgICAgIC8vIGFueSBQaGFudG9tcyB3aGVuIHByb2Nlc3NpbmcgdGhlbSBi ZWNhdXNlIHRoaXMgd291bGQgaW52YWxpZGF0ZSB0aGUgCi0gICAgICAgIC8vIEluc2VydGlvblNl dCdzIGludmFyaWFudCBvZiBpbnNlcnRpbmcgdGhpbmdzIGluIGEgbW9ub3RvbmljYWxseSBpbmNy ZWFzaW5nCi0gICAgICAgIC8vIG9yZGVyLiBUaGlzIHNob3VsZCBiZSBva2F5IGFueXdheXMgYmVj YXVzZSBTdG9yZUJhcnJpZXJzIGNhbid0IGV4aXQuIAogICAgICAgICB9IGVsc2UKICAgICAgICAg ICAgIGFkZFBoYW50b21zSWZOZWNlc3NhcnkoKTsKICAgICB9CkBAIC0xNjA5LDE0ICsxNjA0LDQ2 IEBAIHByaXZhdGU6CiAgICAgCiAgICAgdm9pZCBpbnNlcnRTdG9yZUJhcnJpZXIodW5zaWduZWQg aW5kZXhJbkJsb2NrLCBFZGdlIGNoaWxkMSwgRWRnZSBjaGlsZDIgPSBFZGdlKCkpCiAgICAgewot ICAgICAgICBOb2RlKiBiYXJyaWVyTm9kZTsKLSAgICAgICAgaWYgKCFjaGlsZDIpCi0gICAgICAg ICAgICBiYXJyaWVyTm9kZSA9IG1fZ3JhcGguYWRkTm9kZShTcGVjTm9uZSwgU3RvcmVCYXJyaWVy LCBtX2N1cnJlbnROb2RlLT5vcmlnaW4sIEVkZ2UoY2hpbGQxLm5vZGUoKSwgY2hpbGQxLnVzZUtp bmQoKSkpOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGJhcnJpZXJOb2RlID0gbV9ncmFw aC5hZGROb2RlKFNwZWNOb25lLCBDb25kaXRpb25hbFN0b3JlQmFycmllciwgbV9jdXJyZW50Tm9k ZS0+b3JpZ2luLCAKLSAgICAgICAgICAgICAgICBFZGdlKGNoaWxkMS5ub2RlKCksIGNoaWxkMS51 c2VLaW5kKCkpLCBFZGdlKGNoaWxkMi5ub2RlKCksIGNoaWxkMi51c2VLaW5kKCkpKTsKKyAgICAg ICAgaWYgKCFjaGlsZDIpIHsKKyAgICAgICAgICAgIG1faW5zZXJ0aW9uU2V0Lmluc2VydE5vZGUo CisgICAgICAgICAgICAgICAgaW5kZXhJbkJsb2NrLCBTcGVjTm9uZSwgU3RvcmVCYXJyaWVyLCBt X2N1cnJlbnROb2RlLT5vcmlnaW4sIGNoaWxkMSk7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKyAgICAgICAgCisgICAgICAgIC8vIEZpZ3VyZSBvdXQgc29tZSBjaGVhcCB3YXkgb2Yg YXZvaWRpbmcgdGhlIGJhcnJpZXIgZW50aXJlbHkuIEluIGFkZGl0aW9uIHRvIGJlaW5nCisgICAg ICAgIC8vIGNoZWFwLCB3ZSB0cnkgdG8gbWFrZSB0aGVzZSBjaGVja3Mgc3Ryb25nOiB3ZSB3YW50 IHRvIHByb3ZlIGFzIG11Y2ggYXMgcG9zc2libGUgZm9yCisgICAgICAgIC8vIHRoZSBjb2RlIHRo YXQgZm9sbG93cy4KKyAgICAgICAgaWYgKGNoaWxkMi0+c2hvdWxkU3BlY3VsYXRlSW50MzIoKSkg eworICAgICAgICAgICAgaW5zZXJ0UGhhbnRvbUNoZWNrKGluZGV4SW5CbG9jaywgY2hpbGQyLm5v ZGUoKSwgSW50MzJVc2UpOworICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAg IG1faW5zZXJ0aW9uU2V0Lmluc2VydChpbmRleEluQmxvY2ssIGJhcnJpZXJOb2RlKTsKKyAgICAg ICAgaWYgKGNoaWxkMi0+c2hvdWxkU3BlY3VsYXRlTWFjaGluZUludCgpKSB7CisgICAgICAgICAg ICBpbnNlcnRQaGFudG9tQ2hlY2soaW5kZXhJbkJsb2NrLCBjaGlsZDIubm9kZSgpLCBNYWNoaW5l SW50VXNlKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAoY2hp bGQyLT5zaG91bGRTcGVjdWxhdGVCb29sZWFuKCkpIHsKKyAgICAgICAgICAgIGluc2VydFBoYW50 b21DaGVjayhpbmRleEluQmxvY2ssIGNoaWxkMi5ub2RlKCksIEJvb2xlYW5Vc2UpOworICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmIChjaGlsZDItPnNob3VsZFNwZWN1 bGF0ZU90aGVyKCkpIHsKKyAgICAgICAgICAgIGluc2VydFBoYW50b21DaGVjayhpbmRleEluQmxv Y2ssIGNoaWxkMi5ub2RlKCksIE90aGVyVXNlKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICBpZiAoY2hpbGQyLT5zaG91bGRTcGVjdWxhdGVOb3RDZWxsKCkpIHsKKyAg ICAgICAgICAgIGluc2VydFBoYW50b21DaGVjayhpbmRleEluQmxvY2ssIGNoaWxkMi5ub2RlKCks IE5vdENlbGxVc2UpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIAor ICAgICAgICBtX2luc2VydGlvblNldC5pbnNlcnROb2RlKAorICAgICAgICAgICAgaW5kZXhJbkJs b2NrLCBTcGVjTm9uZSwgQ29uZGl0aW9uYWxTdG9yZUJhcnJpZXIsIG1fY3VycmVudE5vZGUtPm9y aWdpbiwKKyAgICAgICAgICAgIGNoaWxkMSwgRWRnZShjaGlsZDIubm9kZSgpLCBVbnR5cGVkVXNl KSk7CisgICAgfQorICAgIAorICAgIHZvaWQgaW5zZXJ0UGhhbnRvbUNoZWNrKHVuc2lnbmVkIGlu ZGV4SW5CbG9jaywgTm9kZSogbm9kZSwgVXNlS2luZCB1c2VLaW5kKQorICAgIHsKKyAgICAgICAg bV9pbnNlcnRpb25TZXQuaW5zZXJ0Tm9kZSgKKyAgICAgICAgICAgIGluZGV4SW5CbG9jaywgU3Bl Y05vbmUsIFBoYW50b20sIG1fY3VycmVudE5vZGUtPm9yaWdpbiwgRWRnZShub2RlLCB1c2VLaW5k KSk7CisgICAgICAgIG9ic2VydmVVc2VLaW5kT25Ob2RlKG5vZGUsIHVzZUtpbmQpOwogICAgIH0K IAogICAgIHZvaWQgZml4SW50RWRnZShFZGdlJiBlZGdlKQpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdOb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdOb2RlLmgJKHJldmlzaW9uIDE2NDQ2NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDgxLDExICsxNDgxLDIxIEBAIHN0 cnVjdCBOb2RlIHsKICAgICAgICAgcmV0dXJuIGlzT2JqZWN0T3JPdGhlclNwZWN1bGF0aW9uKHBy ZWRpY3Rpb24oKSk7CiAgICAgfQogCisgICAgYm9vbCBzaG91bGRTcGVjdWxhdGVPdGhlcigpCisg ICAgeworICAgICAgICByZXR1cm4gaXNPdGhlclNwZWN1bGF0aW9uKHByZWRpY3Rpb24oKSk7Cisg ICAgfQorCiAgICAgYm9vbCBzaG91bGRTcGVjdWxhdGVDZWxsKCkKICAgICB7CiAgICAgICAgIHJl dHVybiBpc0NlbGxTcGVjdWxhdGlvbihwcmVkaWN0aW9uKCkpOwogICAgIH0KICAgICAKKyAgICBi b29sIHNob3VsZFNwZWN1bGF0ZU5vdENlbGwoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGlzTm90 Q2VsbFNwZWN1bGF0aW9uKHByZWRpY3Rpb24oKSk7CisgICAgfQorICAgIAogICAgIHN0YXRpYyBi b29sIHNob3VsZFNwZWN1bGF0ZUJvb2xlYW4oTm9kZSogb3AxLCBOb2RlKiBvcDIpCiAgICAgewog ICAgICAgICByZXR1cm4gb3AxLT5zaG91bGRTcGVjdWxhdGVCb29sZWFuKCkgJiYgb3AyLT5zaG91 bGRTcGVjdWxhdGVCb29sZWFuKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZU TENhcGFiaWxpdGllcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0 bC9GVExDYXBhYmlsaXRpZXMuY3BwCShyZXZpc2lvbiAxNjQ0NjUpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZnRsL0ZUTENhcGFiaWxpdGllcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzMCw2 ICszMzAsNyBAQCBDYXBhYmlsaXR5TGV2ZWwgY2FuQ29tcGlsZShHcmFwaCYgZ3JhcGgpCiAgICAg ICAgICAgICAgICAgY2FzZSBTdHJpbmdPclN0cmluZ09iamVjdFVzZToKICAgICAgICAgICAgICAg ICBjYXNlIEZpbmFsT2JqZWN0VXNlOgogICAgICAgICAgICAgICAgIGNhc2UgTm90Q2VsbFVzZToK KyAgICAgICAgICAgICAgICBjYXNlIE90aGVyVXNlOgogICAgICAgICAgICAgICAgICAgICAvLyBU aGVzZSBhcmUgT0suCiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAg IGRlZmF1bHQ6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9M TFZNLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2Vy REZHVG9MTFZNLmNwcAkocmV2aXNpb24gMTY0NDY1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4MjIsNyArMzgy Miw3IEBAIHByaXZhdGU6CiAgICAgICAgIAogICAgICAgICBtX291dC5hcHBlbmRUbyhsZWZ0Tm90 Q2VsbENhc2UsIGNvbnRpbnVhdGlvbik7CiAgICAgICAgIEZUTF9UWVBFX0NIRUNLKAotICAgICAg ICAgICAganNWYWx1ZVZhbHVlKGxlZnRWYWx1ZSksIGxlZnRDaGlsZCwgU3BlY090aGVyIHwgU3Bl Y0NlbGwsIGlzTm90TnVsbHkobGVmdFZhbHVlKSk7CisgICAgICAgICAgICBqc1ZhbHVlVmFsdWUo bGVmdFZhbHVlKSwgbGVmdENoaWxkLCBTcGVjT3RoZXIgfCBTcGVjQ2VsbCwgaXNOb3RPdGhlcihs ZWZ0VmFsdWUpKTsKICAgICAgICAgVmFsdWVGcm9tQmxvY2sgbm90Q2VsbFJlc3VsdCA9IG1fb3V0 LmFuY2hvcihtX291dC5ib29sZWFuRmFsc2UpOwogICAgICAgICBtX291dC5qdW1wKGNvbnRpbnVh dGlvbik7CiAgICAgICAgIApAQCAtNDE1NiwxMSArNDE1NiwxMSBAQCBwcml2YXRlOgogICAgICAg ICAgICAgcHJpbWl0aXZlUmVzdWx0ID0gbV9vdXQuZXF1YWwodmFsdWUsIG1fb3V0LmNvbnN0SW50 NjQoVmFsdWVVbmRlZmluZWQpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEVx dWFsTnVsbE9yVW5kZWZpbmVkOgotICAgICAgICAgICAgcHJpbWl0aXZlUmVzdWx0ID0gaXNOdWxs eSh2YWx1ZSk7CisgICAgICAgICAgICBwcmltaXRpdmVSZXN1bHQgPSBpc090aGVyKHZhbHVlKTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFNwZWN1bGF0ZU51bGxPclVuZGVmaW5l ZDoKICAgICAgICAgICAgIEZUTF9UWVBFX0NIRUNLKAotICAgICAgICAgICAgICAgIGpzVmFsdWVW YWx1ZSh2YWx1ZSksIGVkZ2UsIFNwZWNDZWxsIHwgU3BlY090aGVyLCBpc05vdE51bGx5KHZhbHVl KSk7CisgICAgICAgICAgICAgICAganNWYWx1ZVZhbHVlKHZhbHVlKSwgZWRnZSwgU3BlY0NlbGwg fCBTcGVjT3RoZXIsIGlzTm90T3RoZXIodmFsdWUpKTsKICAgICAgICAgICAgIHByaW1pdGl2ZVJl c3VsdCA9IG1fb3V0LmJvb2xlYW5UcnVlOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0K QEAgLTQ4MDksMTMgKzQ4MDksMTMgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIHZhbHVlLCBtX291 dC5jb25zdEludDY0KFZhbHVlVHJ1ZSksIG1fb3V0LmNvbnN0SW50NjQoVmFsdWVGYWxzZSkpOwog ICAgIH0KICAgICAKLSAgICBMVmFsdWUgaXNOb3ROdWxseShMVmFsdWUgdmFsdWUpCisgICAgTFZh bHVlIGlzTm90T3RoZXIoTFZhbHVlIHZhbHVlKQogICAgIHsKICAgICAgICAgcmV0dXJuIG1fb3V0 Lm5vdEVxdWFsKAogICAgICAgICAgICAgbV9vdXQuYml0QW5kKHZhbHVlLCBtX291dC5jb25zdElu dDY0KH5UYWdCaXRVbmRlZmluZWQpKSwKICAgICAgICAgICAgIG1fb3V0LmNvbnN0SW50NjQoVmFs dWVOdWxsKSk7CiAgICAgfQotICAgIExWYWx1ZSBpc051bGx5KExWYWx1ZSB2YWx1ZSkKKyAgICBM VmFsdWUgaXNPdGhlcihMVmFsdWUgdmFsdWUpCiAgICAgewogICAgICAgICByZXR1cm4gbV9vdXQu ZXF1YWwoCiAgICAgICAgICAgICBtX291dC5iaXRBbmQodmFsdWUsIG1fb3V0LmNvbnN0SW50NjQo flRhZ0JpdFVuZGVmaW5lZCkpLApAQCAtNDg2OCw2ICs0ODY4LDkgQEAgcHJpdmF0ZToKICAgICAg ICAgY2FzZSBNYWNoaW5lSW50VXNlOgogICAgICAgICAgICAgc3BlY3VsYXRlTWFjaGluZUludChl ZGdlKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIE90aGVyVXNlOgorICAgICAg ICAgICAgc3BlY3VsYXRlT3RoZXIoZWRnZSk7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAg Y2FzZSBCb29sZWFuVXNlOgogICAgICAgICAgICAgc3BlY3VsYXRlQm9vbGVhbihlZGdlKTsKICAg ICAgICAgICAgIGJyZWFrOwpAQCAtNTAxNSw3ICs1MDE4LDcgQEAgcHJpdmF0ZToKICAgICAgICAg bV9vdXQuYXBwZW5kVG8ocHJpbWl0aXZlQ2FzZSwgY29udGludWF0aW9uKTsKICAgICAgICAgCiAg ICAgICAgIEZUTF9UWVBFX0NIRUNLKAotICAgICAgICAgICAganNWYWx1ZVZhbHVlKHZhbHVlKSwg ZWRnZSwgU3BlY0NlbGwgfCBTcGVjT3RoZXIsIGlzTm90TnVsbHkodmFsdWUpKTsKKyAgICAgICAg ICAgIGpzVmFsdWVWYWx1ZSh2YWx1ZSksIGVkZ2UsIFNwZWNDZWxsIHwgU3BlY090aGVyLCBpc05v dE90aGVyKHZhbHVlKSk7CiAgICAgICAgIAogICAgICAgICBtX291dC5qdW1wKGNvbnRpbnVhdGlv bik7CiAgICAgICAgIApAQCAtNTEzOCw2ICs1MTQxLDE1IEBAIHByaXZhdGU6CiAgICAgICAgIGxv d1doaWNoZXZlckludDUyKGVkZ2UsIGtpbmQpOwogICAgIH0KICAgICAKKyAgICB2b2lkIHNwZWN1 bGF0ZU90aGVyKEVkZ2UgZWRnZSkKKyAgICB7CisgICAgICAgIGlmICghbV9pbnRlcnByZXRlci5u ZWVkc1R5cGVDaGVjayhlZGdlKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBMVmFs dWUgdmFsdWUgPSBsb3dKU1ZhbHVlKGVkZ2UsIE1hbnVhbE9wZXJhbmRTcGVjdWxhdGlvbik7Cisg ICAgICAgIHR5cGVDaGVjayhqc1ZhbHVlVmFsdWUodmFsdWUpLCBlZGdlLCBTcGVjT3RoZXIsIGlz Tm90T3RoZXIodmFsdWUpKTsKKyAgICB9CisgICAgCiAgICAgdm9pZCBzcGVjdWxhdGVCb29sZWFu KEVkZ2UgZWRnZSkKICAgICB7CiAgICAgICAgIGxvd0Jvb2xlYW4oZWRnZSk7CkBAIC01MTQ4LDcg KzUxNjAsNyBAQCBwcml2YXRlOgogICAgICAgICBpZiAoIW1faW50ZXJwcmV0ZXIubmVlZHNUeXBl Q2hlY2soZWRnZSkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIAotICAgICAgICBMVmFs dWUgdmFsdWUgPSBsb3dKU1ZhbHVlKGVkZ2UpOworICAgICAgICBMVmFsdWUgdmFsdWUgPSBsb3dK U1ZhbHVlKGVkZ2UsIE1hbnVhbE9wZXJhbmRTcGVjdWxhdGlvbik7CiAgICAgICAgIHR5cGVDaGVj ayhqc1ZhbHVlVmFsdWUodmFsdWUpLCBlZGdlLCB+U3BlY0NlbGwsIGlzQ2VsbCh2YWx1ZSkpOwog ICAgIH0KICAgICAK