152572 2015-12-27 19:03:56 -0800 FTL B3 should know that used registers are not the same thing as used registers. Rename the latter to unavailable registers to avoid future confusion. 2015-12-28 14:48:24 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 150279 1 fpizlo fpizlo barraclough benjamin ggaren keith_miller mark.lam mhahnenb msaboff nrotem oliver saam sam oldest_to_newest 1151438 0 fpizlo 2015-12-27 19:03:56 -0800 Patch forthcoming. 1151439 1 267947 fpizlo 2015-12-27 19:15:35 -0800 Created attachment 267947 the patch 1151482 2 267947 saam 2015-12-28 12:53:24 -0800 Comment on attachment 267947 the patch r=me 1151489 3 fpizlo 2015-12-28 14:48:24 -0800 Landed in http://trac.webkit.org/changeset/194431 267947 2015-12-27 19:15:35 -0800 2015-12-28 12:53:24 -0800 the patch blah.patch text/plain 9185 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0NDI3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU0IEBA CisyMDE1LTEyLTI3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg RlRMIEIzIHNob3VsZCBrbm93IHRoYXQgdXNlZCByZWdpc3RlcnMgYXJlIG5vdCB0aGUgc2FtZSB0 aGluZyBhcyB1c2VkIHJlZ2lzdGVycy4gUmVuYW1lIHRoZQorICAgICAgICBsYXR0ZXIgdG8gdW5h dmFpbGFibGUgcmVnaXN0ZXJzIHRvIGF2b2lkIGZ1dHVyZSBjb25mdXNpb24uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI1NzIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmlvciB0byB0aGlzIGNoYW5n ZSwgd2UgdXNlZCB0aGUgdGVybSAidXNlZCByZWdpc3RlcnMiIGluIHR3byBkaWZmZXJlbnQgc2Vu c2VzOgorCisgICAgICAgIC0gVGhlIHNldCBvZiByZWdpc3RlcnMgdGhhdCBhcmUgbGl2ZSBhdCBz b21lIHBvaW50IGluIHRoZSBjdXJyZW50IGNvbXBpbGF0aW9uIHVuaXQuIEEKKyAgICAgICAgICBy ZWdpc3RlciBpcyBsaXZlIGF0IHNvbWUgcG9pbnQgaWYgaXQgaXMgcmVhZCBhZnRlciB0aGF0IHBv aW50IG9uIHNvbWUgcGF0aCB0aHJvdWdoIHRoYXQKKyAgICAgICAgICBwb2ludC4KKworICAgICAg ICAtIFRoZSBzZXQgb2YgcmVnaXN0ZXJzIHRoYXQgYXJlIG5vdCBhdmFpbGFibGUgZm9yIHNjcmF0 Y2ggcmVnaXN0ZXIgdXNlIGF0IHNvbWUgcG9pbnQuIEEKKyAgICAgICAgICByZWdpc3RlciBtYXkg bm90IGJlIGF2YWlsYWJsZSBpZiBpdCBpcyBsaXZlIG9yIGlmIGl0IGlzIGEgY2FsbGVlLXNhdmUg cmVnaXN0ZXIgYnV0IGl0IGlzCisgICAgICAgICAgbm90IGJlaW5nIHNhdmVkIGJ5IHRoZSBjdXJy ZW50IGNvbXBpbGF0aW9uLgorCisgICAgICAgIEluIHRoZSBvbGQgRlRMIExMVk0gY29kZSwgd2Ug aGFkIHNvbWUgdHJhbnNsYXRpb25zIGZyb20gdGhlIGZpcnN0IHNlbnNlIGludG8gdGhlIHNlY29u ZAorICAgICAgICBzZW5zZS4gV2UgZm9yZ290IHRvIGRvIHRob3NlIGluIEZUTCBCMywgYW5kIHNv IHdlIGdldCBjcmFzaGVzLCBmb3IgZXhhbXBsZSBpbiBWOC9zcGxheS4gVGhhdAorICAgICAgICBi ZW5jaG1hcmsgaGlnaGxpZ2h0ZWQgdGhpcyBpc3N1ZSBiZWNhdXNlIGl0IGZpcmVkIHNvbWUgbGF6 eSBzbG93IHBhdGhzLCBhbmQgdGhlbiB1c2VkIGFuCisgICAgICAgIHVuc2F2ZWQgY2FsbGVlLXNh dmUgZm9yIHNjcmF0Y2guCisgCisgICAgICAgIEN1cmlvdXNseSwgd2UgY291bGQgbWVyZ2UgdGhl c2UgdHdvIGRlZmluaXRpb25zIGJ5IG9ic2VydmluZyB0aGF0LCBpbiBzb21lIHNlbnNlLCBhbiB1 bnNhdmVkCisgICAgICAgIGNhbGxlZSBzYXZlIGlzIGxpdmUgYXQgZXZlcnkgcG9pbnQgaW4gYSBj b21waWxhdGlvbiBpbiB0aGUgc2Vuc2UgdGhhdCBpdCBtYXkgY29udGFpbiBhIHZhbHVlCisgICAg ICAgIHRoYXQgd2lsbCBiZSByZWFkIHdoZW4gdGhlIGNvbXBpbGF0aW9uIHJldHVybnMuIFRoYXQn cyBwcmV0dHkgY29vbCwgYnV0IGl0IGZlZWxzIHN0cmFuZ2UgdG8KKyAgICAgICAgbWUuIFRoaXMg aXNuJ3QgaG93IHdlIHdvdWxkIG5vcm1hbGx5IGRlZmluZSBsaXZlbmVzcyBvZiByZWdpc3RlcnMu IEl0J3Mgbm90IGhvdyB0aGUKKyAgICAgICAgQWlyOjpUbXBMaXZlbmVzcyBhbmFseXNpcyB3b3Vs ZCBkbyBpdCBmb3IgYW55IG9mIGl0cyBvdGhlciBjbGllbnRzLgorCisgICAgICAgIFNvLCB0aGlz IGNoYW5nZXMgQjMgdG8gaGF2ZSB0d28gZGlmZmVyZW50IGNvbmNlcHRzOgorCisgICAgICAgIC0g VXNlZCByZWdpc3RlcnMuIFRoZXNlIGFyZSB0aGUgcmVnaXN0ZXJzIHRoYXQgYXJlIGxpdmUuCisK KyAgICAgICAgLSBVbmF2YWlsYWJsZSByZWdpc3RlcnMuIFRoZXNlIGFyZSB0aGUgcmVnaXN0ZXJz IHRoYXQgYXJlIG5vdCBhdmFpbGFibGUgZm9yIHNjcmF0Y2guIEl0J3MKKyAgICAgICAgICBhbHdh eXMgYSBzdXBlcnNldCBvZiB1c2VkIHJlZ2lzdGVycy4KKworICAgICAgICBUaGlzIGFsc28gY2hh bmdlcyBGVExMb3dlciB0byB1c2UgdW5hdmFpbGFibGVSZWdpc3RlcnMoKSBwcmV0dHkgbXVjaCBl dmVyeXdoZXJlIHRoYXQgaXQKKyAgICAgICAgcHJldmlvdXNseSB1c2VkIHVzZWRSZWdpc3RlcnMo KS4KKworICAgICAgICBUaGlzIG1ha2VzIGl0IHBvc3NpYmxlIHRvIHJ1biBWOC9zcGxheS4KKwor ICAgICAgICAqIGIzL0IzU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zLmNwcDoKKyAgICAgICAgKEpT Qzo6QjM6OlN0YWNrbWFwR2VuZXJhdGlvblBhcmFtczo6dXNlZFJlZ2lzdGVycyk6CisgICAgICAg IChKU0M6OkIzOjpTdGFja21hcEdlbmVyYXRpb25QYXJhbXM6OnVuYXZhaWxhYmxlUmVnaXN0ZXJz KToKKyAgICAgICAgKEpTQzo6QjM6OlN0YWNrbWFwR2VuZXJhdGlvblBhcmFtczo6cHJvYyk6Cisg ICAgICAgICogYjMvQjNTdGFja21hcEdlbmVyYXRpb25QYXJhbXMuaDoKKyAgICAgICAgKiBmdGwv RlRMTG93ZXJERkdUb0xMVk0uY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdU b0xMVk06OmNvbXBpbGVQdXRCeUlkKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZH VG9MTFZNOjpnZXRCeUlkKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9MTFZN OjpsYXp5U2xvd1BhdGgpOgorCiAyMDE1LTEyLTI2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW5hbWUgTm9kZU1heU92ZXJmbG93SW5YWFggdG8gTm9kZU1heU92 ZXJmbG93SW50MzJJblhYWC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1N0YWNr bWFwR2VuZXJhdGlvblBhcmFtcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2IzL0IzU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zLmNwcAkocmV2aXNpb24gMTk0NDI2KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsMTggQEAgY29uc3QgUmVnaXN0ZXJTZXQmIFN0 YWNrbWFwR2VuZXJhdGlvblBhcgogICAgIHJldHVybiBtX3ZhbHVlLT5tX3VzZWRSZWdpc3RlcnM7 CiB9CiAKK1JlZ2lzdGVyU2V0IFN0YWNrbWFwR2VuZXJhdGlvblBhcmFtczo6dW5hdmFpbGFibGVS ZWdpc3RlcnMoKSBjb25zdAoreworICAgIFJlZ2lzdGVyU2V0IHJlc3VsdCA9IHVzZWRSZWdpc3Rl cnMoKTsKKyAgICAKKyAgICBSZWdpc3RlclNldCB1bnNhdmVkQ2FsbGVlU2F2ZXMgPSBSZWdpc3Rl clNldDo6dm1DYWxsZWVTYXZlUmVnaXN0ZXJzKCk7CisgICAgZm9yIChjb25zdCBSZWdpc3RlckF0 T2Zmc2V0JiByZWdBdE9mZnNldCA6IG1fY29udGV4dC5jb2RlLT5jYWxsZWVTYXZlUmVnaXN0ZXJz KCkpCisgICAgICAgIHVuc2F2ZWRDYWxsZWVTYXZlcy5jbGVhcihyZWdBdE9mZnNldC5yZWcoKSk7 CisKKyAgICByZXN1bHQubWVyZ2UodW5zYXZlZENhbGxlZVNhdmVzKTsKKyAgICByZXR1cm4gcmVz dWx0OworfQorCiBQcm9jZWR1cmUmIFN0YWNrbWFwR2VuZXJhdGlvblBhcmFtczo6cHJvYygpIGNv bnN0CiB7CiAgICAgcmV0dXJuIG1fY29udGV4dC5jb2RlLT5wcm9jKCk7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvYjMvQjNTdGFja21hcEdlbmVyYXRpb25QYXJhbXMuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNTdGFja21hcEdlbmVyYXRpb25QYXJhbXMu aAkocmV2aXNpb24gMTk0NDI2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzU3RhY2tt YXBHZW5lcmF0aW9uUGFyYW1zLmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDYgKzU5LDEzIEBAIHB1 YmxpYzoKICAgICAvLyBUaGlzIHRlbGxzIHlvdSB0aGUgcmVnaXN0ZXJzIHRoYXQgd2VyZSB1c2Vk LgogICAgIGNvbnN0IFJlZ2lzdGVyU2V0JiB1c2VkUmVnaXN0ZXJzKCkgY29uc3Q7CiAKKyAgICAv LyBUaGlzIGlzIGEgdXNlZnVsIGhlbHBlciBpZiB5b3Ugd2FudCB0byBkbyByZWdpc3RlciBhbGxv Y2F0aW9uIGluc2lkZSBvZiBhIHBhdGNocG9pbnQuIFlvdQorICAgIC8vIGNhbiBvbmx5IHVzZSBj YWxsZWUtc2F2ZSByZWdpc3RlcnMgaWYgdGhleSB3ZXJlIHNhdmVkIGluIHRoZSBwcm9sb2d1ZS4g VGhpcyBnaXZlcyB5b3UgdGhlCisgICAgLy8gdXNlZCByZWdpc3RlciBzZXQgdGhhdCdzIHVzZWZ1 bCBmb3Igc3VjaCBzZXR0aW5ncyBieSByZXR1cm5pbmc6CisgICAgLy8KKyAgICAvLyAgICAgdXNl ZFJlZ2lzdGVycygpIHwgKFJlZ2lzdGVyU2V0OjpjYWxsZWVTYXZlUmVnaXN0ZXJzKCkgLSBwcm9j LmNhbGxlZVNhdmVSZWdpc3RlcnMoKSkKKyAgICBSZWdpc3RlclNldCB1bmF2YWlsYWJsZVJlZ2lz dGVycygpIGNvbnN0OworCiAgICAgLy8gVGhpcyBpcyBwcm92aWRlZCBmb3IgY29udmVuaWVuY2U7 IGl0IG1lYW5zIHRoYXQgeW91IGRvbid0IGhhdmUgdG8gY2FwdHVyZSBpdCBpZiB5b3UgZG9uJ3Qg d2FudCB0by4KICAgICBQcm9jZWR1cmUmIHByb2MoKSBjb25zdDsKICAgICAKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCShyZXZpc2lv biAxOTQ0MjYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZN LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU4Niw4ICsyNTg2LDggQEAgcHJpdmF0ZToKICAgICAg ICAgICAgICAgICBhdXRvIGdlbmVyYXRvciA9IEJveDxKSVRQdXRCeUlkR2VuZXJhdG9yPjo6Y3Jl YXRlKAogICAgICAgICAgICAgICAgICAgICBqaXQuY29kZUJsb2NrKCksIG5vZGUtPm9yaWdpbi5z ZW1hbnRpYywKICAgICAgICAgICAgICAgICAgICAgc3RhdGUtPmppdENvZGUtPmNvbW1vbi5hZGRV bmlxdWVDYWxsU2l0ZUluZGV4KG5vZGUtPm9yaWdpbi5zZW1hbnRpYyksCi0gICAgICAgICAgICAg ICAgICAgIHBhcmFtcy51c2VkUmVnaXN0ZXJzKCksIEpTVmFsdWVSZWdzKHBhcmFtc1swXS5ncHIo KSksIEpTVmFsdWVSZWdzKHBhcmFtc1sxXS5ncHIoKSksCi0gICAgICAgICAgICAgICAgICAgIEdQ UkluZm86OnBhdGNocG9pbnRTY3JhdGNoUmVnaXN0ZXIsIGVjbWFNb2RlLAorICAgICAgICAgICAg ICAgICAgICBwYXJhbXMudW5hdmFpbGFibGVSZWdpc3RlcnMoKSwgSlNWYWx1ZVJlZ3MocGFyYW1z WzBdLmdwcigpKSwKKyAgICAgICAgICAgICAgICAgICAgSlNWYWx1ZVJlZ3MocGFyYW1zWzFdLmdw cigpKSwgR1BSSW5mbzo6cGF0Y2hwb2ludFNjcmF0Y2hSZWdpc3RlciwgZWNtYU1vZGUsCiAgICAg ICAgICAgICAgICAgICAgIG5vZGUtPm9wKCkgPT0gUHV0QnlJZERpcmVjdCA/IERpcmVjdCA6IE5v dERpcmVjdCk7CiAKICAgICAgICAgICAgICAgICBnZW5lcmF0b3ItPmdlbmVyYXRlRmFzdFBhdGgo aml0KTsKQEAgLTI2MDMsOCArMjYwMyw4IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAg ICAgICBnZW5lcmF0b3ItPnNsb3dQYXRoSnVtcCgpLmxpbmsoJmppdCk7CiAgICAgICAgICAgICAg ICAgICAgICAgICBDQ2FsbEhlbHBlcnM6OkxhYmVsIHNsb3dQYXRoQmVnaW4gPSBqaXQubGFiZWwo KTsKICAgICAgICAgICAgICAgICAgICAgICAgIENDYWxsSGVscGVyczo6Q2FsbCBzbG93UGF0aENh bGwgPSBjYWxsT3BlcmF0aW9uKAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICpzdGF0ZSwg cGFyYW1zLnVzZWRSZWdpc3RlcnMoKSwgaml0LCBub2RlLT5vcmlnaW4uc2VtYW50aWMsICZleGNl cHRpb25zLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdlbmVyYXRvci0+c2xvd1BhdGhG dW5jdGlvbigpLCBJbnZhbGlkR1BSUmVnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICpz dGF0ZSwgcGFyYW1zLnVuYXZhaWxhYmxlUmVnaXN0ZXJzKCksIGppdCwgbm9kZS0+b3JpZ2luLnNl bWFudGljLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICZleGNlcHRpb25zLCBnZW5lcmF0 b3ItPnNsb3dQYXRoRnVuY3Rpb24oKSwgSW52YWxpZEdQUlJlZywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoZ2VuZXJhdG9yLT5zdHViSW5m bygpKSwgcGFyYW1zWzFdLmdwcigpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFt c1swXS5ncHIoKSwgQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tUHRyKHVpZCkpLmNhbGwoKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIGppdC5qdW1wKCkubGlua1RvKGRvbmUsICZqaXQpOwpAQCAt NzA5MSw3ICs3MDkxLDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBhdXRvIGdlbmVyYXRv ciA9IEJveDxKSVRHZXRCeUlkR2VuZXJhdG9yPjo6Y3JlYXRlKAogICAgICAgICAgICAgICAgICAg ICBqaXQuY29kZUJsb2NrKCksIG5vZGUtPm9yaWdpbi5zZW1hbnRpYywKICAgICAgICAgICAgICAg ICAgICAgc3RhdGUtPmppdENvZGUtPmNvbW1vbi5hZGRVbmlxdWVDYWxsU2l0ZUluZGV4KG5vZGUt Pm9yaWdpbi5zZW1hbnRpYyksCi0gICAgICAgICAgICAgICAgICAgIHBhcmFtcy51c2VkUmVnaXN0 ZXJzKCksIEpTVmFsdWVSZWdzKHBhcmFtc1sxXS5ncHIoKSksIEpTVmFsdWVSZWdzKHBhcmFtc1sw XS5ncHIoKSkpOworICAgICAgICAgICAgICAgICAgICBwYXJhbXMudW5hdmFpbGFibGVSZWdpc3Rl cnMoKSwgSlNWYWx1ZVJlZ3MocGFyYW1zWzFdLmdwcigpKSwKKyAgICAgICAgICAgICAgICAgICAg SlNWYWx1ZVJlZ3MocGFyYW1zWzBdLmdwcigpKSk7CiAKICAgICAgICAgICAgICAgICBnZW5lcmF0 b3ItPmdlbmVyYXRlRmFzdFBhdGgoaml0KTsKICAgICAgICAgICAgICAgICBDQ2FsbEhlbHBlcnM6 OkxhYmVsIGRvbmUgPSBqaXQubGFiZWwoKTsKQEAgLTcxMDYsOCArNzEwNyw4IEBAIHByaXZhdGU6 CiAgICAgICAgICAgICAgICAgICAgICAgICBnZW5lcmF0b3ItPnNsb3dQYXRoSnVtcCgpLmxpbmso JmppdCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBDQ2FsbEhlbHBlcnM6OkxhYmVsIHNsb3dQ YXRoQmVnaW4gPSBqaXQubGFiZWwoKTsKICAgICAgICAgICAgICAgICAgICAgICAgIENDYWxsSGVs cGVyczo6Q2FsbCBzbG93UGF0aENhbGwgPSBjYWxsT3BlcmF0aW9uKAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICpzdGF0ZSwgcGFyYW1zLnVzZWRSZWdpc3RlcnMoKSwgaml0LCBub2RlLT5v cmlnaW4uc2VtYW50aWMsICZleGNlcHRpb25zLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg IG9wZXJhdGlvbkdldEJ5SWRPcHRpbWl6ZSwgcGFyYW1zWzBdLmdwcigpLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICpzdGF0ZSwgcGFyYW1zLnVuYXZhaWxhYmxlUmVnaXN0ZXJzKCksIGpp dCwgbm9kZS0+b3JpZ2luLnNlbWFudGljLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICZl eGNlcHRpb25zLCBvcGVyYXRpb25HZXRCeUlkT3B0aW1pemUsIHBhcmFtc1swXS5ncHIoKSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoZ2Vu ZXJhdG9yLT5zdHViSW5mbygpKSwgcGFyYW1zWzFdLmdwcigpLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIENDYWxsSGVscGVyczo6VHJ1c3RlZEltbVB0cih1aWQpKS5jYWxsKCk7CiAgICAg ICAgICAgICAgICAgICAgICAgICBqaXQuanVtcCgpLmxpbmtUbyhkb25lLCAmaml0KTsKQEAgLTg1 MTYsNyArODUxNyw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpQ YXRjaGFibGVKdW1wIHBhdGNoYWJsZUp1bXAgPSBqaXQucGF0Y2hhYmxlSnVtcCgpOwogICAgICAg ICAgICAgICAgIENDYWxsSGVscGVyczo6TGFiZWwgZG9uZSA9IGppdC5sYWJlbCgpOwogCi0gICAg ICAgICAgICAgICAgUmVnaXN0ZXJTZXQgdXNlZFJlZ2lzdGVycyA9IHBhcmFtcy51c2VkUmVnaXN0 ZXJzKCk7CisgICAgICAgICAgICAgICAgUmVnaXN0ZXJTZXQgdXNlZFJlZ2lzdGVycyA9IHBhcmFt cy51bmF2YWlsYWJsZVJlZ2lzdGVycygpOwogCiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IEFz IHBhcnQgb2YgaGFuZGxpbmcgZXhjZXB0aW9ucywgd2UgbmVlZCB0byBjcmVhdGUgYSBjb25jcmV0 ZSBPU1JFeGl0IGhlcmUuCiAgICAgICAgICAgICAgICAgLy8gRG9pbmcgc28gc2hvdWxkIGF1dG9t YWdpY2FsbHkgcmVnaXN0ZXIgbGF0ZSBwYXRocyB0aGF0IGVtaXQgZXhpdCB0aHVua3MuCkBAIC04 NTQ0LDcgKzg1NDUsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ2VuZXJhdG9ySnVtcCwgQ29kZUxvY2F0aW9uTGFiZWwoCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdm0tPmdldENUSVN0dWIoCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxhenlTbG93UGF0aEdlbmVyYXRpb25UaHVua0dl bmVyYXRvcikuY29kZSgpKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIENvZGVMb2NhdGlvbkp1bXAgbGlua2VkUGF0Y2hhYmxlSnVtcCA9IENvZGVMb2Nh dGlvbkp1bXAoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsaW5rQnVmZmVy LmxvY2F0aW9uT2YocGF0Y2hhYmxlSnVtcCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBDb2RlTG9jYXRpb25MYWJlbCBsaW5rZWREb25lID0gbGlua0J1ZmZlci5sb2NhdGlvbk9m KGRvbmUpOwo=