250599 2023-01-13 16:18:26 -0800 REGRESSION(258696@main): Seems to have caused 1% regression on Speedometer 2023-01-16 16:22:11 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 249956 1 commit-queue commit-queue ashvayka rniwa webkit-bug-importer oldest_to_newest 1925475 0 commit-queue 2023-01-13 16:18:26 -0800 https://commits.webkit.org/258696@main introduced a regression: Seems to have caused 1% regression on Speedometer This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1925477 1 464493 commit-queue 2023-01-13 16:18:33 -0800 Created attachment 464493 REVERT of 258696@main Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1925479 2 ews-feeder 2023-01-13 16:22:00 -0800 Committed 258897@main (30621a8a895b): <https://commits.webkit.org/258897@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464493. 1925483 3 webkit-bug-importer 2023-01-13 16:23:15 -0800 <rdar://problem/104244378> 1925886 4 commit-queue 2023-01-16 16:12:57 -0800 Re-opened since this is blocked by bug 250691 464493 2023-01-13 16:18:33 -0800 2023-01-13 16:22:01 -0800 REVERT of 258696@main bug-250599-20230113161832.patch text/plain 12399 commit-queue RnJvbSAwMzUzNmMzZjVkYjBiYTg1Y2U3MTRkNzI3ZWYwY2E5MTdhMjg0YzdiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDb21taXQgUXVldWUgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3Jn PgpEYXRlOiBGcmksIDEzIEphbiAyMDIzIDE2OjE4OjMwIC0wODAwClN1YmplY3Q6IFtQQVRDSF0g VW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNTg2OTZAbWFpbi4KIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNTA1OTkKClNlZW1zIHRvIGhhdmUgY2F1c2VkIDElIHJlZ3Jl c3Npb24gb24gU3BlZWRvbWV0ZXIKClJldmVydGVkIGNoYW5nZXNldDoKCiJDdXN0b21FbGVtZW50 UmVhY3Rpb25RdWV1ZUl0ZW06IGRvbid0IGFsbG9jYXRlIGFsbCBhcmd1bWVudHMgZm9yIGFsbCBj YWxsYmFjayB0eXBlcyIKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0 OTk1NgpodHRwczovL2NvbW1pdHMud2Via2l0Lm9yZy8yNTg2OTZAbWFpbgotLS0KIC4uLi9kb20v Q3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWUuY3BwICAgICAgICB8IDEwNyArKysrKysrKysrKy0t LS0tLS0KIC4uLi9XZWJDb3JlL2RvbS9DdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZS5oICB8ICAg NCArLQogMiBmaWxlcyBjaGFuZ2VkLCA2NCBpbnNlcnRpb25zKCspLCA0NyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVl dWUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0N1c3RvbUVsZW1lbnRSZWFjdGlvblF1ZXVlLmNw cAppbmRleCBlMDA3ZmQxY2E5NWYuLmUxMjQ5YWUzOWU1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0N1c3RvbUVsZW1lbnRSZWFjdGlvblF1ZXVlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWUuY3BwCkBAIC0xLDUgKzEsNSBAQAog LyoKLSAqIENvcHlyaWdodCAoQykgMjAxNS0yMDIzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNSwgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQzLDE1ICs0Myw4 IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEN1c3RvbUVsZW1lbnRSZWFjdGlvblF1 ZXVlSXRlbSB7Ci0gICAgdXNpbmcgQWRvcHRlZFBheWxvYWQgPSBzdGQ6OnR1cGxlPFJlZjxEb2N1 bWVudD4sIFJlZjxEb2N1bWVudD4+OwotICAgIHVzaW5nIEF0dHJpYnV0ZUNoYW5nZWRQYXlsb2Fk ID0gc3RkOjp0dXBsZTxRdWFsaWZpZWROYW1lLCBBdG9tU3RyaW5nLCBBdG9tU3RyaW5nPjsKLSAg ICB1c2luZyBGb3JtQXNzb2NpYXRlZFBheWxvYWQgPSBSZWZQdHI8SFRNTEZvcm1FbGVtZW50PjsK LSAgICB1c2luZyBGb3JtRGlzYWJsZWRQYXlsb2FkID0gYm9vbDsKLSAgICB1c2luZyBGb3JtU3Rh dGVSZXN0b3JlUGF5bG9hZCA9IEN1c3RvbUVsZW1lbnRGb3JtVmFsdWU7Ci0gICAgdXNpbmcgUGF5 bG9hZCA9IHN0ZDo6b3B0aW9uYWw8c3RkOjp2YXJpYW50PEFkb3B0ZWRQYXlsb2FkLCBBdHRyaWJ1 dGVDaGFuZ2VkUGF5bG9hZCwgRm9ybUFzc29jaWF0ZWRQYXlsb2FkLCBGb3JtRGlzYWJsZWRQYXls b2FkLCBGb3JtU3RhdGVSZXN0b3JlUGF5bG9hZD4+OwotCiBwdWJsaWM6Ci0gICAgZW51bSBjbGFz cyBUeXBlIDogdWludDhfdCB7CisgICAgZW51bSBjbGFzcyBUeXBlIHsKICAgICAgICAgRWxlbWVu dFVwZ3JhZGUsCiAgICAgICAgIENvbm5lY3RlZCwKICAgICAgICAgRGlzY29ubmVjdGVkLApAQCAt NjMsOSArNTYsMzYgQEAgcHVibGljOgogICAgICAgICBGb3JtU3RhdGVSZXN0b3JlLAogICAgIH07 CiAKLSAgICBDdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZUl0ZW0oVHlwZSB0eXBlLCBQYXlsb2Fk IHBheWxvYWQgPSBzdGQ6Om51bGxvcHQpCisgICAgQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWVJ dGVtKFR5cGUgdHlwZSkKICAgICAgICAgOiBtX3R5cGUodHlwZSkKLSAgICAgICAgLCBtX3BheWxv YWQocGF5bG9hZCkKKyAgICB7IH0KKworICAgIEN1c3RvbUVsZW1lbnRSZWFjdGlvblF1ZXVlSXRl bShEb2N1bWVudCYgb2xkRG9jdW1lbnQsIERvY3VtZW50JiBuZXdEb2N1bWVudCkKKyAgICAgICAg OiBtX3R5cGUoVHlwZTo6QWRvcHRlZCkKKyAgICAgICAgLCBtX29sZERvY3VtZW50KCZvbGREb2N1 bWVudCkKKyAgICAgICAgLCBtX25ld0RvY3VtZW50KCZuZXdEb2N1bWVudCkKKyAgICB7IH0KKwor ICAgIEN1c3RvbUVsZW1lbnRSZWFjdGlvblF1ZXVlSXRlbShjb25zdCBRdWFsaWZpZWROYW1lJiBh dHRyaWJ1dGVOYW1lLCBjb25zdCBBdG9tU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgQXRvbVN0cmlu ZyYgbmV3VmFsdWUpCisgICAgICAgIDogbV90eXBlKFR5cGU6OkF0dHJpYnV0ZUNoYW5nZWQpCisg ICAgICAgICwgbV9hdHRyaWJ1dGVOYW1lKGF0dHJpYnV0ZU5hbWUpCisgICAgICAgICwgbV9vbGRW YWx1ZShvbGRWYWx1ZSkKKyAgICAgICAgLCBtX25ld1ZhbHVlKG5ld1ZhbHVlKQorICAgIHsgfQor CisgICAgZXhwbGljaXQgQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWVJdGVtKEhUTUxGb3JtRWxl bWVudCogZm9ybSkKKyAgICAgICAgOiBtX3R5cGUoVHlwZTo6Rm9ybUFzc29jaWF0ZWQpCisgICAg ICAgICwgbV9hc3NvY2lhdGVkRm9ybShmb3JtKQorICAgIHsgfQorCisgICAgZXhwbGljaXQgQ3Vz dG9tRWxlbWVudFJlYWN0aW9uUXVldWVJdGVtKGJvb2wgaXNEaXNhYmxlZCkKKyAgICAgICAgOiBt X3R5cGUoVHlwZTo6Rm9ybURpc2FibGVkKQorICAgICAgICAsIG1faXNEaXNhYmxlZChpc0Rpc2Fi bGVkKQorICAgIHsgfQorCisgICAgZXhwbGljaXQgQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWVJ dGVtKEN1c3RvbUVsZW1lbnRGb3JtVmFsdWUmJiBzdGF0ZSkKKyAgICAgICAgOiBtX3R5cGUoVHlw ZTo6Rm9ybVN0YXRlUmVzdG9yZSkKKyAgICAgICAgLCBtX2Zvcm1Bc3NvY2lhdGVkU3RhdGUoc3Rh dGUpCiAgICAgeyB9CiAKICAgICBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGU7IH0K QEAgLTc0LDUxICs5NCw1MCBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBzd2l0Y2ggKG1fdHlw ZSkgewogICAgICAgICBjYXNlIFR5cGU6OkVsZW1lbnRVcGdyYWRlOgotICAgICAgICAgICAgQVNT RVJUKCFtX3BheWxvYWQuaGFzX3ZhbHVlKCkpOwogICAgICAgICAgICAgZWxlbWVudEludGVyZmFj ZS51cGdyYWRlRWxlbWVudChlbGVtZW50KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBj YXNlIFR5cGU6OkNvbm5lY3RlZDoKLSAgICAgICAgICAgIEFTU0VSVCghbV9wYXlsb2FkLmhhc192 YWx1ZSgpKTsKICAgICAgICAgICAgIGVsZW1lbnRJbnRlcmZhY2UuaW52b2tlQ29ubmVjdGVkQ2Fs bGJhY2soZWxlbWVudCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBUeXBlOjpE aXNjb25uZWN0ZWQ6Ci0gICAgICAgICAgICBBU1NFUlQoIW1fcGF5bG9hZC5oYXNfdmFsdWUoKSk7 CiAgICAgICAgICAgICBlbGVtZW50SW50ZXJmYWNlLmludm9rZURpc2Nvbm5lY3RlZENhbGxiYWNr KGVsZW1lbnQpOwogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgVHlwZTo6QWRvcHRl ZDogewotICAgICAgICAgICAgQVNTRVJUKG1fcGF5bG9hZC5oYXNfdmFsdWUoKSAmJiBzdGQ6Omhv bGRzX2FsdGVybmF0aXZlPEFkb3B0ZWRQYXlsb2FkPihtX3BheWxvYWQudmFsdWUoKSkpOwotICAg ICAgICAgICAgYXV0byYgcGF5bG9hZCA9IHN0ZDo6Z2V0PEFkb3B0ZWRQYXlsb2FkPihtX3BheWxv YWQudmFsdWUoKSk7Ci0gICAgICAgICAgICBlbGVtZW50SW50ZXJmYWNlLmludm9rZUFkb3B0ZWRD YWxsYmFjayhlbGVtZW50LCBzdGQ6OmdldDwwPihwYXlsb2FkKSwgc3RkOjpnZXQ8MT4ocGF5bG9h ZCkpOworICAgICAgICBjYXNlIFR5cGU6OkFkb3B0ZWQ6CisgICAgICAgICAgICBlbGVtZW50SW50 ZXJmYWNlLmludm9rZUFkb3B0ZWRDYWxsYmFjayhlbGVtZW50LCAqbV9vbGREb2N1bWVudCwgKm1f bmV3RG9jdW1lbnQpOwogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgY2Fz ZSBUeXBlOjpBdHRyaWJ1dGVDaGFuZ2VkOiB7Ci0gICAgICAgICAgICBBU1NFUlQobV9wYXlsb2Fk Lmhhc192YWx1ZSgpICYmIHN0ZDo6aG9sZHNfYWx0ZXJuYXRpdmU8QXR0cmlidXRlQ2hhbmdlZFBh eWxvYWQ+KG1fcGF5bG9hZC52YWx1ZSgpKSk7Ci0gICAgICAgICAgICBhdXRvJiBwYXlsb2FkID0g c3RkOjpnZXQ8QXR0cmlidXRlQ2hhbmdlZFBheWxvYWQ+KG1fcGF5bG9hZC52YWx1ZSgpKTsKLSAg ICAgICAgICAgIGVsZW1lbnRJbnRlcmZhY2UuaW52b2tlQXR0cmlidXRlQ2hhbmdlZENhbGxiYWNr KGVsZW1lbnQsIHN0ZDo6Z2V0PDA+KHBheWxvYWQpLCBzdGQ6OmdldDwxPihwYXlsb2FkKSwgc3Rk OjpnZXQ8Mj4ocGF5bG9hZCkpOworICAgICAgICBjYXNlIFR5cGU6OkF0dHJpYnV0ZUNoYW5nZWQ6 CisgICAgICAgICAgICBBU1NFUlQobV9hdHRyaWJ1dGVOYW1lKTsKKyAgICAgICAgICAgIGVsZW1l bnRJbnRlcmZhY2UuaW52b2tlQXR0cmlidXRlQ2hhbmdlZENhbGxiYWNrKGVsZW1lbnQsIG1fYXR0 cmlidXRlTmFtZS52YWx1ZSgpLCBtX29sZFZhbHVlLCBtX25ld1ZhbHVlKTsKICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICB9CiAgICAgICAgIGNhc2UgVHlwZTo6Rm9ybUFzc29jaWF0ZWQ6Ci0g ICAgICAgICAgICBBU1NFUlQobV9wYXlsb2FkLmhhc192YWx1ZSgpICYmIHN0ZDo6aG9sZHNfYWx0 ZXJuYXRpdmU8Rm9ybUFzc29jaWF0ZWRQYXlsb2FkPihtX3BheWxvYWQudmFsdWUoKSkpOwotICAg ICAgICAgICAgZWxlbWVudEludGVyZmFjZS5pbnZva2VGb3JtQXNzb2NpYXRlZENhbGxiYWNrKGVs ZW1lbnQsIHN0ZDo6Z2V0PEZvcm1Bc3NvY2lhdGVkUGF5bG9hZD4obV9wYXlsb2FkLnZhbHVlKCkp LmdldCgpKTsKKyAgICAgICAgICAgIGVsZW1lbnRJbnRlcmZhY2UuaW52b2tlRm9ybUFzc29jaWF0 ZWRDYWxsYmFjayhlbGVtZW50LCBtX2Fzc29jaWF0ZWRGb3JtLmdldCgpKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIFR5cGU6OkZvcm1SZXNldDoKLSAgICAgICAgICAgIEFTU0VS VCghbV9wYXlsb2FkLmhhc192YWx1ZSgpKTsKICAgICAgICAgICAgIGVsZW1lbnRJbnRlcmZhY2Uu aW52b2tlRm9ybVJlc2V0Q2FsbGJhY2soZWxlbWVudCk7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgY2FzZSBUeXBlOjpGb3JtRGlzYWJsZWQ6Ci0gICAgICAgICAgICBBU1NFUlQobV9wYXls b2FkLmhhc192YWx1ZSgpICYmIHN0ZDo6aG9sZHNfYWx0ZXJuYXRpdmU8Rm9ybURpc2FibGVkUGF5 bG9hZD4obV9wYXlsb2FkLnZhbHVlKCkpKTsKLSAgICAgICAgICAgIGVsZW1lbnRJbnRlcmZhY2Uu aW52b2tlRm9ybURpc2FibGVkQ2FsbGJhY2soZWxlbWVudCwgc3RkOjpnZXQ8Rm9ybURpc2FibGVk UGF5bG9hZD4obV9wYXlsb2FkLnZhbHVlKCkpKTsKKyAgICAgICAgICAgIEFTU0VSVChtX2lzRGlz YWJsZWQpOworICAgICAgICAgICAgZWxlbWVudEludGVyZmFjZS5pbnZva2VGb3JtRGlzYWJsZWRD YWxsYmFjayhlbGVtZW50LCBtX2lzRGlzYWJsZWQudmFsdWUoKSk7CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBUeXBlOjpGb3JtU3RhdGVSZXN0b3JlOgotICAgICAgICAgICAgQVNT RVJUKG1fcGF5bG9hZC5oYXNfdmFsdWUoKSAmJiBzdGQ6OmhvbGRzX2FsdGVybmF0aXZlPEZvcm1T dGF0ZVJlc3RvcmVQYXlsb2FkPihtX3BheWxvYWQudmFsdWUoKSkpOwotICAgICAgICAgICAgZWxl bWVudEludGVyZmFjZS5pbnZva2VGb3JtU3RhdGVSZXN0b3JlQ2FsbGJhY2soZWxlbWVudCwgc3Rk OjpnZXQ8Rm9ybVN0YXRlUmVzdG9yZVBheWxvYWQ+KG1fcGF5bG9hZC52YWx1ZSgpKSk7CisgICAg ICAgICAgICBlbGVtZW50SW50ZXJmYWNlLmludm9rZUZvcm1TdGF0ZVJlc3RvcmVDYWxsYmFjayhl bGVtZW50LCBtX2Zvcm1Bc3NvY2lhdGVkU3RhdGUpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KICAgICB9CiAKIHByaXZhdGU6CiAgICAgVHlwZSBtX3R5cGU7Ci0gICAgUGF5bG9hZCBt X3BheWxvYWQ7CisgICAgUmVmUHRyPERvY3VtZW50PiBtX29sZERvY3VtZW50OworICAgIFJlZlB0 cjxEb2N1bWVudD4gbV9uZXdEb2N1bWVudDsKKyAgICBzdGQ6Om9wdGlvbmFsPFF1YWxpZmllZE5h bWU+IG1fYXR0cmlidXRlTmFtZTsKKyAgICBBdG9tU3RyaW5nIG1fb2xkVmFsdWU7CisgICAgQXRv bVN0cmluZyBtX25ld1ZhbHVlOworCisgICAgLy8gRklYTUU6IERvbid0IGFsbG9jYXRlIGFsbCB0 aGVzZSBhcmd1bWVudHMgZm9yIGFsbCBjYWxsYmFjayB0eXBlcy4KKyAgICAvLyBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQ5OTU2CisgICAgc3RkOjpvcHRpb25hbDxi b29sPiBtX2lzRGlzYWJsZWQ7CisgICAgUmVmUHRyPEhUTUxGb3JtRWxlbWVudD4gbV9hc3NvY2lh dGVkRm9ybTsKKyAgICBDdXN0b21FbGVtZW50Rm9ybVZhbHVlIG1fZm9ybUFzc29jaWF0ZWRTdGF0 ZTsKIH07CiAKIEN1c3RvbUVsZW1lbnRSZWFjdGlvblF1ZXVlOjpDdXN0b21FbGVtZW50UmVhY3Rp b25RdWV1ZShKU0N1c3RvbUVsZW1lbnRJbnRlcmZhY2UmIGVsZW1lbnRJbnRlcmZhY2UpCkBAIC0x NTAsNyArMTY5LDcgQEAgdm9pZCBDdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZTo6ZW5xdWV1ZUVs ZW1lbnRVcGdyYWRlKEVsZW1lbnQmIGVsZW1lbnQsIGJvb2wgYWwKICAgICBpZiAoYWxyZWFkeVNj aGVkdWxlZFRvVXBncmFkZSkKICAgICAgICAgQVNTRVJUKHF1ZXVlLmhhc0p1c3RVcGdyYWRlUmVh Y3Rpb24oKSk7CiAgICAgZWxzZQotICAgICAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZChJdGVtOjpU eXBlOjpFbGVtZW50VXBncmFkZSk7CisgICAgICAgIHF1ZXVlLm1faXRlbXMuYXBwZW5kKHtDdXN0 b21FbGVtZW50UmVhY3Rpb25RdWV1ZUl0ZW06OlR5cGU6OkVsZW1lbnRVcGdyYWRlfSk7CiAgICAg ZW5xdWV1ZUVsZW1lbnRPbkFwcHJvcHJpYXRlRWxlbWVudFF1ZXVlKGVsZW1lbnQpOwogfQogCkBA IC0xODMsNyArMjAyLDcgQEAgdm9pZCBDdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZTo6ZW5xdWV1 ZUNvbm5lY3RlZENhbGxiYWNrSWZOZWVkZWQoRWxlbWVudCYgZWxlbWUKICAgICBhdXRvJiBxdWV1 ZSA9ICplbGVtZW50LnJlYWN0aW9uUXVldWUoKTsKICAgICBpZiAoIXF1ZXVlLm1faW50ZXJmYWNl LT5oYXNDb25uZWN0ZWRDYWxsYmFjaygpKQogICAgICAgICByZXR1cm47Ci0gICAgcXVldWUubV9p dGVtcy5hcHBlbmQoSXRlbTo6VHlwZTo6Q29ubmVjdGVkKTsKKyAgICBxdWV1ZS5tX2l0ZW1zLmFw cGVuZCh7Q3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWVJdGVtOjpUeXBlOjpDb25uZWN0ZWR9KTsK ICAgICBlbnF1ZXVlRWxlbWVudE9uQXBwcm9wcmlhdGVFbGVtZW50UXVldWUoZWxlbWVudCk7CiB9 CiAKQEAgLTE5Nyw3ICsyMTYsNyBAQCB2b2lkIEN1c3RvbUVsZW1lbnRSZWFjdGlvblF1ZXVlOjpl bnF1ZXVlRGlzY29ubmVjdGVkQ2FsbGJhY2tJZk5lZWRlZChFbGVtZW50JiBlbAogICAgIGF1dG8m IHF1ZXVlID0gKmVsZW1lbnQucmVhY3Rpb25RdWV1ZSgpOwogICAgIGlmICghcXVldWUubV9pbnRl cmZhY2UtPmhhc0Rpc2Nvbm5lY3RlZENhbGxiYWNrKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBx dWV1ZS5tX2l0ZW1zLmFwcGVuZChJdGVtOjpUeXBlOjpEaXNjb25uZWN0ZWQpOworICAgIHF1ZXVl Lm1faXRlbXMuYXBwZW5kKHtDdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZUl0ZW06OlR5cGU6OkRp c2Nvbm5lY3RlZH0pOwogICAgIGVucXVldWVFbGVtZW50T25BcHByb3ByaWF0ZUVsZW1lbnRRdWV1 ZShlbGVtZW50KTsKIH0KIApAQCAtMjEwLDcgKzIyOSw3IEBAIHZvaWQgQ3VzdG9tRWxlbWVudFJl YWN0aW9uUXVldWU6OmVucXVldWVBZG9wdGVkQ2FsbGJhY2tJZk5lZWRlZChFbGVtZW50JiBlbGVt ZW50CiAgICAgYXV0byYgcXVldWUgPSAqZWxlbWVudC5yZWFjdGlvblF1ZXVlKCk7CiAgICAgaWYg KCFxdWV1ZS5tX2ludGVyZmFjZS0+aGFzQWRvcHRlZENhbGxiYWNrKCkpCiAgICAgICAgIHJldHVy bjsKLSAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZCh7IEl0ZW06OlR5cGU6OkFkb3B0ZWQsIHN0ZDo6 bWFrZV90dXBsZShSZWYgeyBvbGREb2N1bWVudCB9LCBSZWYgeyBuZXdEb2N1bWVudCB9KSB9KTsK KyAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZCh7b2xkRG9jdW1lbnQsIG5ld0RvY3VtZW50fSk7CiAg ICAgZW5xdWV1ZUVsZW1lbnRPbkFwcHJvcHJpYXRlRWxlbWVudFF1ZXVlKGVsZW1lbnQpOwogfQog CkBAIC0yMjMsNyArMjQyLDcgQEAgdm9pZCBDdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZTo6ZW5x dWV1ZUF0dHJpYnV0ZUNoYW5nZWRDYWxsYmFja0lmTmVlZGVkKEVsZW1lbnQKICAgICBhdXRvJiBx dWV1ZSA9ICplbGVtZW50LnJlYWN0aW9uUXVldWUoKTsKICAgICBpZiAoIXF1ZXVlLm1faW50ZXJm YWNlLT5vYnNlcnZlc0F0dHJpYnV0ZShhdHRyaWJ1dGVOYW1lLmxvY2FsTmFtZSgpKSkKICAgICAg ICAgcmV0dXJuOwotICAgIHF1ZXVlLm1faXRlbXMuYXBwZW5kKHsgSXRlbTo6VHlwZTo6QXR0cmli dXRlQ2hhbmdlZCwgc3RkOjptYWtlX3R1cGxlKGF0dHJpYnV0ZU5hbWUsIG9sZFZhbHVlLCBuZXdW YWx1ZSkgfSk7CisgICAgcXVldWUubV9pdGVtcy5hcHBlbmQoe2F0dHJpYnV0ZU5hbWUsIG9sZFZh bHVlLCBuZXdWYWx1ZX0pOwogICAgIGVucXVldWVFbGVtZW50T25BcHByb3ByaWF0ZUVsZW1lbnRR dWV1ZShlbGVtZW50KTsKIH0KIApAQCAtMjM2LDcgKzI1NSw3IEBAIHZvaWQgQ3VzdG9tRWxlbWVu dFJlYWN0aW9uUXVldWU6OmVucXVldWVGb3JtQXNzb2NpYXRlZENhbGxiYWNrSWZOZWVkZWQoRWxl bWVudCYKICAgICBpZiAoIXF1ZXVlLm1faW50ZXJmYWNlLT5oYXNGb3JtQXNzb2NpYXRlZENhbGxi YWNrKCkpCiAgICAgICAgIHJldHVybjsKICAgICBBU1NFUlQocXVldWUuaXNGb3JtQXNzb2NpYXRl ZCgpKTsKLSAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZCh7IEl0ZW06OlR5cGU6OkZvcm1Bc3NvY2lh dGVkLCBhc3NvY2lhdGVkRm9ybSB9KTsKKyAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZChDdXN0b21F bGVtZW50UmVhY3Rpb25RdWV1ZUl0ZW0geyBhc3NvY2lhdGVkRm9ybSB9KTsKICAgICBlbnF1ZXVl RWxlbWVudE9uQXBwcm9wcmlhdGVFbGVtZW50UXVldWUoZWxlbWVudCk7CiB9CiAKQEAgLTI0OCw3 ICsyNjcsNyBAQCB2b2lkIEN1c3RvbUVsZW1lbnRSZWFjdGlvblF1ZXVlOjplbnF1ZXVlRm9ybVJl c2V0Q2FsbGJhY2tJZk5lZWRlZChFbGVtZW50JiBlbGVtZQogICAgIGlmICghcXVldWUubV9pbnRl cmZhY2UtPmhhc0Zvcm1SZXNldENhbGxiYWNrKCkpCiAgICAgICAgIHJldHVybjsKICAgICBBU1NF UlQocXVldWUuaXNGb3JtQXNzb2NpYXRlZCgpKTsKLSAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZChJ dGVtOjpUeXBlOjpGb3JtUmVzZXQpOworICAgIHF1ZXVlLm1faXRlbXMuYXBwZW5kKHsgQ3VzdG9t RWxlbWVudFJlYWN0aW9uUXVldWVJdGVtOjpUeXBlOjpGb3JtUmVzZXQgfSk7CiAgICAgZW5xdWV1 ZUVsZW1lbnRPbkFwcHJvcHJpYXRlRWxlbWVudFF1ZXVlKGVsZW1lbnQpOwogfQogCkBAIC0yNjAs NyArMjc5LDcgQEAgdm9pZCBDdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZTo6ZW5xdWV1ZUZvcm1E aXNhYmxlZENhbGxiYWNrSWZOZWVkZWQoRWxlbWVudCYgZWwKICAgICBpZiAoIXF1ZXVlLm1faW50 ZXJmYWNlLT5oYXNGb3JtRGlzYWJsZWRDYWxsYmFjaygpKQogICAgICAgICByZXR1cm47CiAgICAg QVNTRVJUKHF1ZXVlLmlzRm9ybUFzc29jaWF0ZWQoKSk7Ci0gICAgcXVldWUubV9pdGVtcy5hcHBl bmQoeyBJdGVtOjpUeXBlOjpGb3JtRGlzYWJsZWQsIGlzRGlzYWJsZWQgfSk7CisgICAgcXVldWUu bV9pdGVtcy5hcHBlbmQoQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWVJdGVtIHsgaXNEaXNhYmxl ZCB9KTsKICAgICBlbnF1ZXVlRWxlbWVudE9uQXBwcm9wcmlhdGVFbGVtZW50UXVldWUoZWxlbWVu dCk7CiB9CiAKQEAgLTI3Miw3ICsyOTEsNyBAQCB2b2lkIEN1c3RvbUVsZW1lbnRSZWFjdGlvblF1 ZXVlOjplbnF1ZXVlRm9ybVN0YXRlUmVzdG9yZUNhbGxiYWNrSWZOZWVkZWQoRWxlbWVudAogICAg IGlmICghcXVldWUubV9pbnRlcmZhY2UtPmhhc0Zvcm1TdGF0ZVJlc3RvcmVDYWxsYmFjaygpKQog ICAgICAgICByZXR1cm47CiAgICAgQVNTRVJUKHF1ZXVlLmlzRm9ybUFzc29jaWF0ZWQoKSk7Ci0g ICAgcXVldWUubV9pdGVtcy5hcHBlbmQoeyBJdGVtOjpUeXBlOjpGb3JtU3RhdGVSZXN0b3JlLCBX VEZNb3ZlKHN0YXRlKSB9KTsKKyAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZChDdXN0b21FbGVtZW50 UmVhY3Rpb25RdWV1ZUl0ZW0geyBXVEZNb3ZlKHN0YXRlKSB9KTsKICAgICBlbnF1ZXVlRWxlbWVu dE9uQXBwcm9wcmlhdGVFbGVtZW50UXVldWUoZWxlbWVudCk7CiB9CiAKQEAgLTI4OSwxMiArMzA4 LDEyIEBAIHZvaWQgQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWU6OmVucXVldWVQb3N0VXBncmFk ZVJlYWN0aW9ucyhFbGVtZW50JiBlbGVtZW50KQogICAgIGlmIChlbGVtZW50Lmhhc0F0dHJpYnV0 ZXMoKSkgewogICAgICAgICBmb3IgKGF1dG8mIGF0dHJpYnV0ZSA6IGVsZW1lbnQuYXR0cmlidXRl c0l0ZXJhdG9yKCkpIHsKICAgICAgICAgICAgIGlmIChxdWV1ZS5tX2ludGVyZmFjZS0+b2JzZXJ2 ZXNBdHRyaWJ1dGUoYXR0cmlidXRlLmxvY2FsTmFtZSgpKSkKLSAgICAgICAgICAgICAgICBxdWV1 ZS5tX2l0ZW1zLmFwcGVuZCh7IEl0ZW06OlR5cGU6OkF0dHJpYnV0ZUNoYW5nZWQsIHN0ZDo6bWFr ZV90dXBsZShhdHRyaWJ1dGUubmFtZSgpLCBudWxsQXRvbSgpLCBhdHRyaWJ1dGUudmFsdWUoKSkg fSk7CisgICAgICAgICAgICAgICAgcXVldWUubV9pdGVtcy5hcHBlbmQoe2F0dHJpYnV0ZS5uYW1l KCksIG51bGxBdG9tKCksIGF0dHJpYnV0ZS52YWx1ZSgpfSk7CiAgICAgICAgIH0KICAgICB9CiAK ICAgICBpZiAoZWxlbWVudC5pc0Nvbm5lY3RlZCgpICYmIHF1ZXVlLm1faW50ZXJmYWNlLT5oYXND b25uZWN0ZWRDYWxsYmFjaygpKQotICAgICAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZChJdGVtOjpU eXBlOjpDb25uZWN0ZWQpOworICAgICAgICBxdWV1ZS5tX2l0ZW1zLmFwcGVuZCh7Q3VzdG9tRWxl bWVudFJlYWN0aW9uUXVldWVJdGVtOjpUeXBlOjpDb25uZWN0ZWR9KTsKIH0KIAogYm9vbCBDdXN0 b21FbGVtZW50UmVhY3Rpb25RdWV1ZTo6b2JzZXJ2ZXNTdHlsZUF0dHJpYnV0ZSgpIGNvbnN0CkBA IC0zMzAsNyArMzQ5LDcgQEAgdm9pZCBDdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZTo6c2V0RWxl bWVudEludGVybmFsc0F0dGFjaGVkKCkKIHZvaWQgQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWU6 Omludm9rZUFsbChFbGVtZW50JiBlbGVtZW50KQogewogICAgIHdoaWxlICghbV9pdGVtcy5pc0Vt cHR5KCkpIHsKLSAgICAgICAgVmVjdG9yPEl0ZW0+IGl0ZW1zID0gV1RGTW92ZShtX2l0ZW1zKTsK KyAgICAgICAgVmVjdG9yPEN1c3RvbUVsZW1lbnRSZWFjdGlvblF1ZXVlSXRlbT4gaXRlbXMgPSBX VEZNb3ZlKG1faXRlbXMpOwogICAgICAgICBmb3IgKGF1dG8mIGl0ZW0gOiBpdGVtcykKICAgICAg ICAgICAgIGl0ZW0uaW52b2tlKGVsZW1lbnQsIG1faW50ZXJmYWNlLmdldCgpKTsKICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWUu aCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DdXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZS5oCmluZGV4 IDdkMjNiMmE5ZTAxOC4uYWFlOGMwMzgyOTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vQ3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v Q3VzdG9tRWxlbWVudFJlYWN0aW9uUXVldWUuaApAQCAtMTAyLDEwICsxMDIsOCBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGVucXVldWVFbGVtZW50T25BcHByb3ByaWF0ZUVs ZW1lbnRRdWV1ZShFbGVtZW50Jik7CiAKLSAgICB1c2luZyBJdGVtID0gQ3VzdG9tRWxlbWVudFJl YWN0aW9uUXVldWVJdGVtOwotCiAgICAgUmVmPEpTQ3VzdG9tRWxlbWVudEludGVyZmFjZT4gbV9p bnRlcmZhY2U7Ci0gICAgVmVjdG9yPEl0ZW0+IG1faXRlbXM7CisgICAgVmVjdG9yPEN1c3RvbUVs ZW1lbnRSZWFjdGlvblF1ZXVlSXRlbT4gbV9pdGVtczsKICAgICBib29sIG1fZWxlbWVudEludGVy bmFsc0F0dGFjaGVkIHsgZmFsc2UgfTsKIH07CiAK