164885 2016-11-17 13:29:34 -0800 Speculatively disable eager object zero-fill on not-x86 to let the bots decide if that's a problem 2016-11-17 13:37:52 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 164823 1 fpizlo fpizlo cdumez commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1252422 0 fpizlo 2016-11-17 13:29:34 -0800 Patch forthcoming. 1252424 1 295078 fpizlo 2016-11-17 13:33:33 -0800 Created attachment 295078 the patch 1252425 2 295078 mark.lam 2016-11-17 13:35:04 -0800 Comment on attachment 295078 the patch r=me 1252426 3 295078 fpizlo 2016-11-17 13:36:44 -0800 Comment on attachment 295078 the patch I'll land it myself. 1252428 4 fpizlo 2016-11-17 13:37:52 -0800 Landed in http://trac.webkit.org/changeset/208860 295078 2016-11-17 13:33:33 -0800 2016-11-17 13:36:44 -0800 the patch blan.patch text/plain 11409 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4ODU5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBA CisyMDE2LTExLTE3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg U3BlY3VsYXRpdmVseSBkaXNhYmxlIGVhZ2VyIG9iamVjdCB6ZXJvLWZpbGwgb24gbm90LXg4NiB0 byBsZXQgdGhlIGJvdHMgZGVjaWRlIGlmIHRoYXQncyBhIHByb2JsZW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDg4NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhpcyBhZGRzIGEgdXNl R0NGZW5jZXMoKSBmdW5jdGlvbiB0aGF0IHdlIHVzZSB0byBndWFyZCBhbGwgZWFnZXIgb2JqZWN0 IHplcm8tZmlsbCBhbmQgdGhlCisgICAgICAgIHJlbGF0ZWQgZmVuY2VzLiBJdCBjdXJyZW50bHkg cmV0dXJucyB0cnVlIG9ubHkgb24geDg2KCkuCisgICAgICAgIAorICAgICAgICBUaGUgZ29hbCBo ZXJlIGlzIHRvIGdldCB0aGUgYm90cyB0byB0ZWxsIHVzIGlmIHRoaXMgY29kZSBpcyByZXNwb25z aWJsZSBmb3IgcGVyZiBpc3N1ZXMgb24KKyAgICAgICAgYW55IG5vbi14ODYgcGxhdGZvcm1zLiBX ZSBoYXZlIGEgZmV3IGRpZmZlcmVudCBwYXRocyB0aGF0IHdlIGNhbiBwdXJzdWUgaWYgdGhpcyB0 dXJucyBvdXQKKyAgICAgICAgdG8gYmUgdGhlIGNhc2UuIEVhZ2VyIHplcm8tZmlsbCBpcyBtZXJl bHkgdGhlIGVhc2llc3Qgd2F5IHRvIG9wdGltaXplIG91dCBzb21lIGZlbmNlcywgYnV0CisgICAg ICAgIHdlIGNvdWxkIGdldCByaWQgb2YgaXQgYW5kIGluc3RlYWQgdGVhY2ggQjMgaG93IHRvIHRo aW5rIGFib3V0IGZlbmNlcy4KKworICAgICAgICAqIGFzc2VtYmxlci9DUFUuaDoKKyAgICAgICAg KEpTQzo6dXNlR0NGZW5jZXMpOgorICAgICAgICAqIGJ5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNz LmNwcDoKKyAgICAgICAgKEpTQzo6QWNjZXNzQ2FzZTo6Z2VuZXJhdGVJbXBsKToKKyAgICAgICAg KiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0 aXZlSklUOjpjb21waWxlQWxsb2NhdGVQcm9wZXJ0eVN0b3JhZ2UpOgorICAgICAgICAoSlNDOjpE Rkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlUmVhbGxvY2F0ZVByb3BlcnR5U3RvcmFnZSk6Cisg ICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZH OjpMb3dlckRGR1RvQjM6OmNvbXBpbGVNYXRlcmlhbGl6ZU5ld09iamVjdCk6CisgICAgICAgIChK U0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmFsbG9jYXRlUHJvcGVydHlTdG9yYWdlKToKKyAg ICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6cmVhbGxvY2F0ZVByb3BlcnR5U3Rv cmFnZSk6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmFsbG9jYXRlT2Jq ZWN0KToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6bXV0YXRvckZlbmNl KToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6c2V0QnV0dGVyZmx5KToK KyAgICAgICAgKiBqaXQvQXNzZW1ibHlIZWxwZXJzLmg6CisgICAgICAgIChKU0M6OkFzc2VtYmx5 SGVscGVyczo6bXV0YXRvckZlbmNlKToKKyAgICAgICAgKEpTQzo6QXNzZW1ibHlIZWxwZXJzOjpz dG9yZUJ1dHRlcmZseSk6CisgICAgICAgIChKU0M6OkFzc2VtYmx5SGVscGVyczo6ZW1pdEluaXRp YWxpemVJbmxpbmVTdG9yYWdlKToKKyAgICAgICAgKEpTQzo6QXNzZW1ibHlIZWxwZXJzOjplbWl0 SW5pdGlhbGl6ZU91dE9mTGluZVN0b3JhZ2UpOgorCiAyMDE2LTExLTE3ICBLZWl0aCBNaWxsZXIg IDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCByb3RhdGUgdG8gV2FzbQpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9DUFUuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0NQVS5oCShyZXZpc2lvbiAyMDg4NDcp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0NQVS5oCSh3b3JraW5nIGNvcHkp CkBAIC04NSw1ICs4NSwxMCBAQCBpbmxpbmUgYm9vbCBvcHRpbWl6ZUZvclg4Nl82NCgpCiAgICAg cmV0dXJuIGlzWDg2XzY0KCkgJiYgT3B0aW9uczo6dXNlQXJjaGl0ZWN0dXJlU3BlY2lmaWNPcHRp bWl6YXRpb25zKCk7CiB9CiAKK2lubGluZSBib29sIHVzZUdDRmVuY2VzKCkKK3sKKyAgICByZXR1 cm4gaXNYODYoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgSlNDCiAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmNwcAkocmV2 aXNpb24gMjA4ODQ3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3Jw aGljQWNjZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4Myw4ICsxMjgzLDEwIEBAIHZvaWQg QWNjZXNzQ2FzZTo6Z2VuZXJhdGVJbXBsKEFjY2Vzc0dlbmUKICAgICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBm b3IgKHNpemVfdCBvZmZzZXQgPSBvbGRTaXplOyBvZmZzZXQgPCBuZXdTaXplOyBvZmZzZXQgKz0g c2l6ZW9mKHZvaWQqKSkKLSAgICAgICAgICAgICAgICAgICAgaml0LnN0b3JlUHRyKENDYWxsSGVs cGVyczo6VHJ1c3RlZEltbVB0cigwKSwgQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKHNjcmF0Y2hHUFIs IC1zdGF0aWNfY2FzdDxwdHJkaWZmX3Q+KG9mZnNldCArIHNpemVvZihKU1ZhbHVlKSArIHNpemVv Zih2b2lkKikpKSk7CisgICAgICAgICAgICAgICAgaWYgKHVzZUdDRmVuY2VzKCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgZm9yIChzaXplX3Qgb2Zmc2V0ID0gb2xkU2l6ZTsgb2Zmc2V0IDwgbmV3 U2l6ZTsgb2Zmc2V0ICs9IHNpemVvZih2b2lkKikpCisgICAgICAgICAgICAgICAgICAgICAgICBq aXQuc3RvcmVQdHIoQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tUHRyKDApLCBDQ2FsbEhlbHBlcnM6 OkFkZHJlc3Moc2NyYXRjaEdQUiwgLXN0YXRpY19jYXN0PHB0cmRpZmZfdD4ob2Zmc2V0ICsgc2l6 ZW9mKEpTVmFsdWUpICsgc2l6ZW9mKHZvaWQqKSkpKTsKKyAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIC8vIEhhbmRsZSB0aGUgY2FzZSB3aGVy ZSB3ZSBhcmUgYWxsb2NhdGluZyBvdXQtb2YtbGluZSB1c2luZyBhbiBvcGVyYXRpb24uCiAgICAg ICAgICAgICAgICAgUmVnaXN0ZXJTZXQgZXh0cmFSZWdpc3RlcnNUb1ByZXNlcnZlOwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHJl dmlzaW9uIDIwODg0NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRp dmVKSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NDExLDEwICs3NDExLDEyIEBAIHZvaWQgU3Bl Y3VsYXRpdmVKSVQ6OmNvbXBpbGVBbGxvY2F0ZVByb3AKICAgICBtX2ppdC5lbWl0QWxsb2NhdGUo c2NyYXRjaEdQUjEsIGFsbG9jYXRvciwgc2NyYXRjaEdQUjIsIHNjcmF0Y2hHUFIzLCBzbG93UGF0 aCk7CiAgICAgbV9qaXQuYWRkUHRyKEpJVENvbXBpbGVyOjpUcnVzdGVkSW1tMzIoc2l6ZSArIHNp emVvZihJbmRleGluZ0hlYWRlcikpLCBzY3JhdGNoR1BSMSk7CiAgICAgCi0gICAgZm9yIChwdHJk aWZmX3Qgb2Zmc2V0ID0gMDsgb2Zmc2V0IDwgc3RhdGljX2Nhc3Q8cHRyZGlmZl90PihzaXplKTsg b2Zmc2V0ICs9IHNpemVvZih2b2lkKikpCi0gICAgICAgIG1faml0LnN0b3JlUHRyKFRydXN0ZWRJ bW1QdHIoMCksIEpJVENvbXBpbGVyOjpBZGRyZXNzKHNjcmF0Y2hHUFIxLCAtKG9mZnNldCArIHNp emVvZihKU1ZhbHVlKSArIHNpemVvZih2b2lkKikpKSk7Ci0gICAgCi0gICAgbV9qaXQubXV0YXRv ckZlbmNlKCk7CisgICAgaWYgKHVzZUdDRmVuY2VzKCkpIHsKKyAgICAgICAgZm9yIChwdHJkaWZm X3Qgb2Zmc2V0ID0gMDsgb2Zmc2V0IDwgc3RhdGljX2Nhc3Q8cHRyZGlmZl90PihzaXplKTsgb2Zm c2V0ICs9IHNpemVvZih2b2lkKikpCisgICAgICAgICAgICBtX2ppdC5zdG9yZVB0cihUcnVzdGVk SW1tUHRyKDApLCBKSVRDb21waWxlcjo6QWRkcmVzcyhzY3JhdGNoR1BSMSwgLShvZmZzZXQgKyBz aXplb2YoSlNWYWx1ZSkgKyBzaXplb2Yodm9pZCopKSkpOworICAgICAgICAKKyAgICAgICAgbV9q aXQubXV0YXRvckZlbmNlKCk7CisgICAgfQogICAgICAgICAKICAgICBhZGRTbG93UGF0aEdlbmVy YXRvcigKICAgICAgICAgc2xvd1BhdGhDYWxsKHNsb3dQYXRoLCB0aGlzLCBvcGVyYXRpb25BbGxv Y2F0ZVByb3BlcnR5U3RvcmFnZVdpdGhJbml0aWFsQ2FwYWNpdHksIHNjcmF0Y2hHUFIxKSk7CkBA IC03NDY2LDggKzc0NjgsMTAgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVJlYWxsb2Nh dGVQcgogICAgIAogICAgIG1faml0LmFkZFB0cihKSVRDb21waWxlcjo6VHJ1c3RlZEltbTMyKG5l d1NpemUgKyBzaXplb2YoSW5kZXhpbmdIZWFkZXIpKSwgc2NyYXRjaEdQUjEpOwogICAgICAgICAK LSAgICBmb3IgKHB0cmRpZmZfdCBvZmZzZXQgPSBvbGRTaXplOyBvZmZzZXQgPCBzdGF0aWNfY2Fz dDxwdHJkaWZmX3Q+KG5ld1NpemUpOyBvZmZzZXQgKz0gc2l6ZW9mKHZvaWQqKSkKLSAgICAgICAg bV9qaXQuc3RvcmVQdHIoVHJ1c3RlZEltbVB0cigwKSwgSklUQ29tcGlsZXI6OkFkZHJlc3Moc2Ny YXRjaEdQUjEsIC0ob2Zmc2V0ICsgc2l6ZW9mKEpTVmFsdWUpICsgc2l6ZW9mKHZvaWQqKSkpKTsK KyAgICBpZiAodXNlR0NGZW5jZXMoKSkgeworICAgICAgICBmb3IgKHB0cmRpZmZfdCBvZmZzZXQg PSBvbGRTaXplOyBvZmZzZXQgPCBzdGF0aWNfY2FzdDxwdHJkaWZmX3Q+KG5ld1NpemUpOyBvZmZz ZXQgKz0gc2l6ZW9mKHZvaWQqKSkKKyAgICAgICAgICAgIG1faml0LnN0b3JlUHRyKFRydXN0ZWRJ bW1QdHIoMCksIEpJVENvbXBpbGVyOjpBZGRyZXNzKHNjcmF0Y2hHUFIxLCAtKG9mZnNldCArIHNp emVvZihKU1ZhbHVlKSArIHNpemVvZih2b2lkKikpKSk7CisgICAgfQogCiAgICAgYWRkU2xvd1Bh dGhHZW5lcmF0b3IoCiAgICAgICAgIHNsb3dQYXRoQ2FsbChzbG93UGF0aCwgdGhpcywgb3BlcmF0 aW9uQWxsb2NhdGVQcm9wZXJ0eVN0b3JhZ2UsIHNjcmF0Y2hHUFIxLCBuZXdTaXplIC8gc2l6ZW9m KEpTVmFsdWUpKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZH VG9CMy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dl ckRGR1RvQjMuY3BwCShyZXZpc2lvbiAyMDg4NDcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgxMzQsMTEgKzgxMzQs MTMgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBWYWx1ZUZy b21CbG9jayBoYXZlQnV0dGVyZmx5ID0gbV9vdXQuYW5jaG9yKGZhc3RCdXR0ZXJmbHlWYWx1ZSk7 CiAgICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgc3BsYXRXb3JkcygKLSAgICAgICAg ICAgICAgICAgICAgZmFzdEJ1dHRlcmZseVZhbHVlLAotICAgICAgICAgICAgICAgICAgICBtX291 dC5jb25zdEludDMyKC1zdHJ1Y3R1cmUtPm91dE9mTGluZUNhcGFjaXR5KCkgLSAxKSwKLSAgICAg ICAgICAgICAgICAgICAgbV9vdXQuY29uc3RJbnQzMigtMSksCi0gICAgICAgICAgICAgICAgICAg IG1fb3V0LmludDY0WmVybywgbV9oZWFwcy5wcm9wZXJ0aWVzLmF0QW55TnVtYmVyKCkpOworICAg ICAgICAgICAgICAgIGlmICh1c2VHQ0ZlbmNlcygpKSB7CisgICAgICAgICAgICAgICAgICAgIHNw bGF0V29yZHMoCisgICAgICAgICAgICAgICAgICAgICAgICBmYXN0QnV0dGVyZmx5VmFsdWUsCisg ICAgICAgICAgICAgICAgICAgICAgICBtX291dC5jb25zdEludDMyKC1zdHJ1Y3R1cmUtPm91dE9m TGluZUNhcGFjaXR5KCkgLSAxKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fb3V0LmNvbnN0 SW50MzIoLTEpLAorICAgICAgICAgICAgICAgICAgICAgICAgbV9vdXQuaW50NjRaZXJvLCBtX2hl YXBzLnByb3BlcnRpZXMuYXRBbnlOdW1iZXIoKSk7CisgICAgICAgICAgICAgICAgfQogCiAgICAg ICAgICAgICAgICAgbV9vdXQuc3RvcmUzMih2ZWN0b3JMZW5ndGgsIGZhc3RCdXR0ZXJmbHlWYWx1 ZSwgbV9oZWFwcy5CdXR0ZXJmbHlfdmVjdG9yTGVuZ3RoKTsKICAgICAgICAgICAgICAgICAKQEAg LTkwMTMsMTAgKzkwMTUsMTIgQEAgcHJpdmF0ZToKICAgICAgICAgCiAgICAgICAgIExWYWx1ZSBy ZXN1bHQgPSBhbGxvY2F0ZVByb3BlcnR5U3RvcmFnZVdpdGhTaXplSW1wbChpbml0aWFsT3V0T2ZM aW5lQ2FwYWNpdHkpOwogCi0gICAgICAgIHNwbGF0V29yZHMoCi0gICAgICAgICAgICByZXN1bHQs Ci0gICAgICAgICAgICBtX291dC5jb25zdEludDMyKC1pbml0aWFsT3V0T2ZMaW5lQ2FwYWNpdHkg LSAxKSwgbV9vdXQuY29uc3RJbnQzMigtMSksCi0gICAgICAgICAgICBtX291dC5pbnQ2NFplcm8s IG1faGVhcHMucHJvcGVydGllcy5hdEFueU51bWJlcigpKTsKKyAgICAgICAgaWYgKHVzZUdDRmVu Y2VzKCkpIHsKKyAgICAgICAgICAgIHNwbGF0V29yZHMoCisgICAgICAgICAgICAgICAgcmVzdWx0 LAorICAgICAgICAgICAgICAgIG1fb3V0LmNvbnN0SW50MzIoLWluaXRpYWxPdXRPZkxpbmVDYXBh Y2l0eSAtIDEpLCBtX291dC5jb25zdEludDMyKC0xKSwKKyAgICAgICAgICAgICAgICBtX291dC5p bnQ2NFplcm8sIG1faGVhcHMucHJvcGVydGllcy5hdEFueU51bWJlcigpKTsKKyAgICAgICAgfQog ICAgICAgICAKICAgICAgICAgc2V0QnV0dGVyZmx5KHJlc3VsdCwgb2JqZWN0KTsKICAgICAgICAg cmV0dXJuIHJlc3VsdDsKQEAgLTkwNDYsMTAgKzkwNTAsMTIgQEAgcHJpdmF0ZToKICAgICAgICAg ICAgIG1fb3V0LnN0b3JlUHRyKGxvYWRlZCwgbV9vdXQuYWRkcmVzcyhtX2hlYXBzLnByb3BlcnRp ZXMuYXRBbnlOdW1iZXIoKSwgcmVzdWx0LCBvZmZzZXQpKTsKICAgICAgICAgfQogICAgICAgICAK LSAgICAgICAgc3BsYXRXb3JkcygKLSAgICAgICAgICAgIHJlc3VsdCwKLSAgICAgICAgICAgIG1f b3V0LmNvbnN0SW50MzIoLW5ld1NpemUgLSAxKSwgbV9vdXQuY29uc3RJbnQzMigtb2xkU2l6ZSAt IDEpLAotICAgICAgICAgICAgbV9vdXQuaW50NjRaZXJvLCBtX2hlYXBzLnByb3BlcnRpZXMuYXRB bnlOdW1iZXIoKSk7CisgICAgICAgIGlmICh1c2VHQ0ZlbmNlcygpKSB7CisgICAgICAgICAgICBz cGxhdFdvcmRzKAorICAgICAgICAgICAgICAgIHJlc3VsdCwKKyAgICAgICAgICAgICAgICBtX291 dC5jb25zdEludDMyKC1uZXdTaXplIC0gMSksIG1fb3V0LmNvbnN0SW50MzIoLW9sZFNpemUgLSAx KSwKKyAgICAgICAgICAgICAgICBtX291dC5pbnQ2NFplcm8sIG1faGVhcHMucHJvcGVydGllcy5h dEFueU51bWJlcigpKTsKKyAgICAgICAgfQogICAgICAgICAKICAgICAgICAgc2V0QnV0dGVyZmx5 KHJlc3VsdCwgb2JqZWN0KTsKICAgICAgICAgCkBAIC05OTI2LDEyICs5OTMyLDE0IEBAIHByaXZh dGU6CiAgICAgICAgIExWYWx1ZSBhbGxvY2F0b3IsIFN0cnVjdHVyZSogc3RydWN0dXJlLCBMVmFs dWUgYnV0dGVyZmx5LCBMQmFzaWNCbG9jayBzbG93UGF0aCkKICAgICB7CiAgICAgICAgIExWYWx1 ZSByZXN1bHQgPSBhbGxvY2F0ZUNlbGwoYWxsb2NhdG9yLCBzdHJ1Y3R1cmUsIHNsb3dQYXRoKTsK LSAgICAgICAgc3BsYXRXb3JkcygKLSAgICAgICAgICAgIHJlc3VsdCwKLSAgICAgICAgICAgIG1f b3V0LmNvbnN0SW50MzIoSlNGaW5hbE9iamVjdDo6b2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCkgLyA4 KSwKLSAgICAgICAgICAgIG1fb3V0LmNvbnN0SW50MzIoSlNGaW5hbE9iamVjdDo6b2Zmc2V0T2ZJ bmxpbmVTdG9yYWdlKCkgLyA4ICsgc3RydWN0dXJlLT5pbmxpbmVDYXBhY2l0eSgpKSwKLSAgICAg ICAgICAgIG1fb3V0LmludDY0WmVybywKLSAgICAgICAgICAgIG1faGVhcHMucHJvcGVydGllcy5h dEFueU51bWJlcigpKTsKKyAgICAgICAgaWYgKHVzZUdDRmVuY2VzKCkpIHsKKyAgICAgICAgICAg IHNwbGF0V29yZHMoCisgICAgICAgICAgICAgICAgcmVzdWx0LAorICAgICAgICAgICAgICAgIG1f b3V0LmNvbnN0SW50MzIoSlNGaW5hbE9iamVjdDo6b2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCkgLyA4 KSwKKyAgICAgICAgICAgICAgICBtX291dC5jb25zdEludDMyKEpTRmluYWxPYmplY3Q6Om9mZnNl dE9mSW5saW5lU3RvcmFnZSgpIC8gOCArIHN0cnVjdHVyZS0+aW5saW5lQ2FwYWNpdHkoKSksCisg ICAgICAgICAgICAgICAgbV9vdXQuaW50NjRaZXJvLAorICAgICAgICAgICAgICAgIG1faGVhcHMu cHJvcGVydGllcy5hdEFueU51bWJlcigpKTsKKyAgICAgICAgfQogICAgICAgICBtX291dC5zdG9y ZVB0cihidXR0ZXJmbHksIHJlc3VsdCwgbV9oZWFwcy5KU09iamVjdF9idXR0ZXJmbHkpOwogICAg ICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KQEAgLTEyNTcxLDcgKzEyNTc5LDcgQEAgcHJpdmF0 ZToKICAgICAKICAgICB2b2lkIG11dGF0b3JGZW5jZSgpCiAgICAgewotICAgICAgICBpZiAoaXNY ODYoKSkgeworICAgICAgICBpZiAoaXNYODYoKSB8fCAhdXNlR0NGZW5jZXMoKSkgewogICAgICAg ICAgICAgbV9vdXQuZmVuY2UoJm1faGVhcHMucm9vdCwgbnVsbHB0cik7CiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KQEAgLTEyNTk1LDcgKzEyNjAzLDcgQEAgcHJpdmF0ZToKICAgICAK ICAgICB2b2lkIHNldEJ1dHRlcmZseShMVmFsdWUgYnV0dGVyZmx5LCBMVmFsdWUgb2JqZWN0KQog ICAgIHsKLSAgICAgICAgaWYgKGlzWDg2KCkpIHsKKyAgICAgICAgaWYgKGlzWDg2KCkgfHwgIXVz ZUdDRmVuY2VzKCkpIHsKICAgICAgICAgICAgIG1fb3V0LmZlbmNlKCZtX2hlYXBzLnJvb3QsIG51 bGxwdHIpOwogICAgICAgICAgICAgbV9vdXQuc3RvcmVQdHIoYnV0dGVyZmx5LCBvYmplY3QsIG1f aGVhcHMuSlNPYmplY3RfYnV0dGVyZmx5KTsKICAgICAgICAgICAgIG1fb3V0LmZlbmNlKCZtX2hl YXBzLnJvb3QsIG51bGxwdHIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9Bc3Nl bWJseUhlbHBlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Fz c2VtYmx5SGVscGVycy5oCShyZXZpc2lvbiAyMDg4NDcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0Fzc2VtYmx5SGVscGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYzLDcgKzEzNjMs NyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBtdXRhdG9yRmVuY2UoKQogICAgIHsKLSAgICAg ICAgaWYgKGlzWDg2KCkpCisgICAgICAgIGlmIChpc1g4NigpIHx8ICF1c2VHQ0ZlbmNlcygpKQog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBKdW1wIG9rID0ganVtcElmTXV0YXRvckZlbmNl Tm90TmVlZGVkKCk7CiAgICAgICAgIHN0b3JlRmVuY2UoKTsKQEAgLTEzNzIsNyArMTM3Miw3IEBA IHB1YmxpYzoKICAgICAKICAgICB2b2lkIHN0b3JlQnV0dGVyZmx5KEdQUlJlZyBidXR0ZXJmbHks IEdQUlJlZyBvYmplY3QpCiAgICAgewotICAgICAgICBpZiAoaXNYODYoKSkgeworICAgICAgICBp ZiAoaXNYODYoKSB8fCAhdXNlR0NGZW5jZXMoKSkgewogICAgICAgICAgICAgc3RvcmVQdHIoYnV0 dGVyZmx5LCBBZGRyZXNzKG9iamVjdCwgSlNPYmplY3Q6OmJ1dHRlcmZseU9mZnNldCgpKSk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTE2MTgsMTIgKzE2MTgsMTYgQEAgcHVi bGljOgogICAgIAogICAgIHZvaWQgZW1pdEluaXRpYWxpemVJbmxpbmVTdG9yYWdlKEdQUlJlZyBi YXNlR1BSLCB1bnNpZ25lZCBpbmxpbmVDYXBhY2l0eSkKICAgICB7CisgICAgICAgIGlmICghdXNl R0NGZW5jZXMoKSkKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IGlubGluZUNhcGFjaXR5OyArK2kpCiAgICAgICAgICAgICBzdG9yZVRydXN0ZWRW YWx1ZShKU1ZhbHVlKCksIEFkZHJlc3MoYmFzZUdQUiwgSlNPYmplY3Q6Om9mZnNldE9mSW5saW5l U3RvcmFnZSgpICsgaSAqIHNpemVvZihFbmNvZGVkSlNWYWx1ZSkpKTsKICAgICB9CiAKICAgICB2 b2lkIGVtaXRJbml0aWFsaXplSW5saW5lU3RvcmFnZShHUFJSZWcgYmFzZUdQUiwgR1BSUmVnIGlu bGluZUNhcGFjaXR5KQogICAgIHsKKyAgICAgICAgaWYgKCF1c2VHQ0ZlbmNlcygpKQorICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICBKdW1wIGVtcHR5ID0gYnJhbmNoVGVzdDMyKFplcm8sIGlu bGluZUNhcGFjaXR5KTsKICAgICAgICAgTGFiZWwgbG9vcCA9IGxhYmVsKCk7CiAgICAgICAgIHN1 YjMyKFRydXN0ZWRJbW0zMigxKSwgaW5saW5lQ2FwYWNpdHkpOwpAQCAtMTYzNCw2ICsxNjM4LDgg QEAgcHVibGljOgogCiAgICAgdm9pZCBlbWl0SW5pdGlhbGl6ZU91dE9mTGluZVN0b3JhZ2UoR1BS UmVnIGJ1dHRlcmZseUdQUiwgdW5zaWduZWQgb3V0T2ZMaW5lQ2FwYWNpdHkpCiAgICAgeworICAg ICAgICBpZiAoIXVzZUdDRmVuY2VzKCkpCisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBvdXRPZkxpbmVDYXBhY2l0eTsgKytpKQogICAgICAgICAg ICAgc3RvcmVUcnVzdGVkVmFsdWUoSlNWYWx1ZSgpLCBBZGRyZXNzKGJ1dHRlcmZseUdQUiwgLXNp emVvZihJbmRleGluZ0hlYWRlcikgLSAoaSArIDEpICogc2l6ZW9mKEVuY29kZWRKU1ZhbHVlKSkp OwogICAgIH0K