237888 2022-03-15 06:27:16 -0700 MacroAssemblerARMv7: Be friendlier to DisallowMacroScratchRegisterUsage 2022-03-16 05:07:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 angelos angelos achristensen ews-watchlist glore keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki zdobersek oldest_to_newest 1851258 0 angelos 2022-03-15 06:27:16 -0700 MacroAssemblerARMv7: Be friendlier to DisallowMacroScratchRegisterUsage 1851264 1 454700 angelos 2022-03-15 06:41:59 -0700 Created attachment 454700 Patch 1851708 2 454814 angelos 2022-03-16 03:15:42 -0700 Created attachment 454814 Patch 1851726 3 ews-feeder 2022-03-16 05:06:15 -0700 Committed r291339 (248478@main): <https://commits.webkit.org/248478@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454814. 1851727 4 webkit-bug-importer 2022-03-16 05:07:18 -0700 <rdar://problem/90363980> 454700 2022-03-15 06:41:59 -0700 2022-03-16 03:15:37 -0700 Patch bug-237888-20220315134157.patch text/plain 9397 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy MWM5ODVjZjBmM2ViZDFhYzM1NmQzMGRlYmUyOWE4ZTBmNjE0YzRkLi5mMzUwMzE0ZjhlNjZhNzhm NTdiMzIzZTlmMWVkM2FlODhiMTVlYWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MyBAQAorMjAyMi0wMy0xNSAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NA aWdhbGlhLmNvbT4KKworICAgICAgICBNYWNyb0Fzc2VtYmxlckFSTXY3OiBCZSBmcmllbmRsaWVy IHRvIERpc2FsbG93TWFjcm9TY3JhdGNoUmVnaXN0ZXJVc2FnZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3ODg4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT25seSBjaGVjayB0aGF0IHdlJ3JlIGFsbG93 ZWQgdG8gdXNlIHRoZSBzY3JhdGNoIHJlZ2lzdGVyIGF0IHNpdGVzCisgICAgICAgIHdoZXJlIHdl J3JlIHVzaW5nIGl0IGltcGxpY2l0bHkuIFdoZW4gaXQncyBleHBsaWNpdGx5IHBhc3NlZCBpbiBi eSB0aGUKKyAgICAgICAgY2FsbGVyLCB1c2UgaW52YWxpZGF0ZUNhY2hlZEFkZHJlc3NUZW1wUmVn aXN0ZXIgdG8gaW52YWxpZGF0ZSBpdAorICAgICAgICB3aXRob3V0IGFzc2VydGluZyBhbnl0aGlu ZyBhYm91dCBtX2FsbG93U2NyYXRjaFJlZ2lzdGVyLgorCisgICAgICAgIFNpbmNlIGhlbHBlcnMg Y2FuIGV4cGxpY3RseSBtYWtlIHVzZSBvZiBhZGRyZXNzVGVtcFJlZ2lzdGVyLCBhbgorICAgICAg ICBhcmd1bWVudCBjYW4gYmUgbWFkZSB0aGF0IHRoaXMgaXMgc3RpbGwgZnJhZ2lsZSAoaS5lLiBm dXR1cmUgY2hhbmdlcworICAgICAgICBjb3VsZCBydW4gaW50byB0aGlzKS4gVGhlIGFsdGVybmF0 aXZlIHdvdWxkIGJlIHRvIGhhdmUgdGhlIHRvcG1vc3QgY2FsbGVyCisgICAgICAgIGRvIGZpbmUt Z3JhaW5lZCBtYW5hZ2VtZW50IG9mIERpc2FsbG93TWFjcm9TY3JhdGNoUmVnaXN0ZXJVc2FnZSwK KyAgICAgICAgYWxsb3dpbmcgaXQgYXJvdW5kIGV4cGxpY2l0IGNhbGxzIHRvIE1hY3JvQXNzZW1i bGVyQVJNdjcgd2l0aAorICAgICAgICBzY3JhdGNoUmVnaXN0ZXIoKSBpbiB0aGUgYXJndW1lbnRz IGFuZCBkaXNhbGxvd2luZyBpdCBmb3IgaGVscGVycy4KKworICAgICAgICBBcyB0aGVyZSBhcmUg Y3VycmVudGx5IG5vIGhlbHBlcnMgdGhhdCB3b3VsZCB0cmlwIHRoaXMsIHRoaXMgcGF0Y2ggb3B0 cworICAgICAgICBmb3IgdGhlIGZvcm1lciBhcHByb2FjaCwgdG8gbWFrZSBEaXNhbGxvd01hY3Jv U2NyYXRjaFJlZ2lzdGVyVXNhZ2UKKyAgICAgICAgZWFzaWVyIHRvIHdvcmsgd2l0aCAodGhlcmUn bGwgYmUgbW9yZSB1c2FnZSBvZiB0aGUgQVBJIGluIGFuIHVwY29taW5nCisgICAgICAgIHdhc20z MiBwYXRjaCkuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oOgor ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3OjpzY3JhdGNoUmVnaXN0ZXIpOgorICAg ICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3Ojpsb2FkMzIpOgorICAgICAgICAoSlNDOjpN YWNyb0Fzc2VtYmxlckFSTXY3Ojpsb2FkMTYpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxl ckFSTXY3Ojpsb2FkMTZTaWduZWRFeHRlbmRUbzMyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJBUk12Nzo6bG9hZDgpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3Ojps b2FkOFNpZ25lZEV4dGVuZFRvMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3 Ojpsb2FkUGFpcjMyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk12Nzo6bW92ZSk6 CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNdjc6OmZhckp1bXApOgorICAgICAgICAo SlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3OjpzZXR1cEFybUFkZHJlc3MpOgorICAgICAgICAoSlND OjpNYWNyb0Fzc2VtYmxlckFSTXY3OjppbnZhbGlkYXRlQ2FjaGVkQWRkcmVzc1RlbXBSZWdpc3Rl cik6CisgICAgICAgICogYnl0ZWNvZGUvQ2FsbExpbmtJbmZvLmNwcDoKKyAgICAgICAgKEpTQzo6 Q2FsbExpbmtJbmZvOjplbWl0RmFzdFBhdGhJbXBsKToKKyAgICAgICAgKiBqaXQvQmFzZWxpbmVK SVRSZWdpc3RlcnMuaDoKKwogMjAyMi0wMy0xMyAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFu Z2Vsb3NAaWdhbGlhLmNvbT4KIAogICAgICAgICBbSlNDXSBVc2UgYWRkcmVzc1RlbXBSZWdpc3Rl ciBpbiBsb2FkVmFsdWUodm9pZCAqKSBvbiAzMiBiaXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCmluZGV4IDQwZDg5MzBk N2JjZDhmZTNjZmZmYTZiMTc5MGYwMzI3OGUxYTdkNDcuLmZlN2YyZDVjNGYzZmI0MWMxZDM1NWVl OTQ0ZGRkNWE1YWUxNDAwOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCkBAIC03OCw3ICs3OCwxMiBAQCBwdWJsaWM6 CiAgICAgc3RhdGljIGNvbnN0ZXhwciB1bnNpZ25lZCBudW1HUFJzID0gc3RkOjppbml0aWFsaXpl cl9saXN0PGludD4oeyBGT1JfRUFDSF9HUF9SRUdJU1RFUihEVU1NWV9SRUdJU1RFUl9WQUxVRSkg fSkuc2l6ZSgpOwogICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgbnVtRlBScyA9IHN0ZDo6 aW5pdGlhbGl6ZXJfbGlzdDxpbnQ+KHsgRk9SX0VBQ0hfRlBfUkVHSVNURVIoRFVNTVlfUkVHSVNU RVJfVkFMVUUpIH0pLnNpemUoKTsKICN1bmRlZiBEVU1NWV9SRUdJU1RFUl9WQUxVRQotICAgIHN0 YXRpYyBjb25zdGV4cHIgUmVnaXN0ZXJJRCBzY3JhdGNoUmVnaXN0ZXIoKSB7IHJldHVybiBhZGRy ZXNzVGVtcFJlZ2lzdGVyOyB9CisgICAgc3RhdGljIGNvbnN0ZXhwciBSZWdpc3RlcklEIHNfc2Ny YXRjaFJlZ2lzdGVyID0gYWRkcmVzc1RlbXBSZWdpc3RlcjsKKyAgICBSZWdpc3RlcklEIHNjcmF0 Y2hSZWdpc3RlcigpCisgICAgeworICAgICAgICBSRUxFQVNFX0FTU0VSVChtX2FsbG93U2NyYXRj aFJlZ2lzdGVyKTsKKyAgICAgICAgcmV0dXJuIHNfc2NyYXRjaFJlZ2lzdGVyOworICAgIH0KIAog ICAgIE1hY3JvQXNzZW1ibGVyQVJNdjcoKQogICAgICAgICA6IG1fbWFrZUp1bXBQYXRjaGFibGUo ZmFsc2UpCkBAIC02NzksNyArNjg0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGxvYWQzMihBcm1B ZGRyZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAgIGlmIChkZXN0 ID09IGFkZHJlc3NUZW1wUmVnaXN0ZXIpCi0gICAgICAgICAgICBjYWNoZWRBZGRyZXNzVGVtcFJl Z2lzdGVyKCkuaW52YWxpZGF0ZSgpOworICAgICAgICAgICAgaW52YWxpZGF0ZUNhY2hlZEFkZHJl c3NUZW1wUmVnaXN0ZXIoKTsKICAgICAgICAgZWxzZSBpZiAoZGVzdCA9PSBkYXRhVGVtcFJlZ2lz dGVyKQogICAgICAgICAgICAgY2FjaGVkRGF0YVRlbXBSZWdpc3RlcigpLmludmFsaWRhdGUoKTsK IApAQCAtNjk4LDcgKzcwMyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBsb2FkMTYoQXJtQWRkcmVz cyBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBpZiAoZGVzdCA9PSBh ZGRyZXNzVGVtcFJlZ2lzdGVyKQotICAgICAgICAgICAgY2FjaGVkQWRkcmVzc1RlbXBSZWdpc3Rl cigpLmludmFsaWRhdGUoKTsKKyAgICAgICAgICAgIGludmFsaWRhdGVDYWNoZWRBZGRyZXNzVGVt cFJlZ2lzdGVyKCk7CiAgICAgICAgIGVsc2UgaWYgKGRlc3QgPT0gZGF0YVRlbXBSZWdpc3RlcikK ICAgICAgICAgICAgIGNhY2hlZERhdGFUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7CiAKQEAg LTcxOCw3ICs3MjMsNyBAQCBwcml2YXRlOgogICAgIHsKICAgICAgICAgQVNTRVJUKGFkZHJlc3Mu dHlwZSA9PSBBcm1BZGRyZXNzOjpIYXNJbmRleCk7CiAgICAgICAgIGlmIChkZXN0ID09IGFkZHJl c3NUZW1wUmVnaXN0ZXIpCi0gICAgICAgICAgICBjYWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCku aW52YWxpZGF0ZSgpOworICAgICAgICAgICAgaW52YWxpZGF0ZUNhY2hlZEFkZHJlc3NUZW1wUmVn aXN0ZXIoKTsKICAgICAgICAgZWxzZSBpZiAoZGVzdCA9PSBkYXRhVGVtcFJlZ2lzdGVyKQogICAg ICAgICAgICAgY2FjaGVkRGF0YVRlbXBSZWdpc3RlcigpLmludmFsaWRhdGUoKTsKIApAQCAtNzI4 LDcgKzczMyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBsb2FkOChBcm1BZGRyZXNzIGFkZHJlc3Ms IFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAgIGlmIChkZXN0ID09IGFkZHJlc3NUZW1w UmVnaXN0ZXIpCi0gICAgICAgICAgICBjYWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCkuaW52YWxp ZGF0ZSgpOworICAgICAgICAgICAgaW52YWxpZGF0ZUNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIo KTsKICAgICAgICAgZWxzZSBpZiAoZGVzdCA9PSBkYXRhVGVtcFJlZ2lzdGVyKQogICAgICAgICAg ICAgY2FjaGVkRGF0YVRlbXBSZWdpc3RlcigpLmludmFsaWRhdGUoKTsKIApAQCAtNzQ4LDcgKzc1 Myw3IEBAIHByaXZhdGU6CiAgICAgewogICAgICAgICBBU1NFUlQoYWRkcmVzcy50eXBlID09IEFy bUFkZHJlc3M6Okhhc0luZGV4KTsKICAgICAgICAgaWYgKGRlc3QgPT0gYWRkcmVzc1RlbXBSZWdp c3RlcikKLSAgICAgICAgICAgIGNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRl KCk7CisgICAgICAgICAgICBpbnZhbGlkYXRlQ2FjaGVkQWRkcmVzc1RlbXBSZWdpc3RlcigpOwog ICAgICAgICBlbHNlIGlmIChkZXN0ID09IGRhdGFUZW1wUmVnaXN0ZXIpCiAgICAgICAgICAgICBj YWNoZWREYXRhVGVtcFJlZ2lzdGVyKCkuaW52YWxpZGF0ZSgpOwogCkBAIC05MzMsNyArOTM4LDcg QEAgcHVibGljOgogICAgICAgICAgICAgICAgIGFic09mZnNldCA9IC1hYnNPZmZzZXQ7CiAgICAg ICAgICAgICBpZiAoIShhYnNPZmZzZXQgJiB+MHgzZmMpKSB7CiAgICAgICAgICAgICAgICAgaWYg KChkZXN0MSA9PSBhZGRyZXNzVGVtcFJlZ2lzdGVyKSB8fCAoZGVzdDIgPT0gYWRkcmVzc1RlbXBS ZWdpc3RlcikpCi0gICAgICAgICAgICAgICAgICAgIGNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIo KS5pbnZhbGlkYXRlKCk7CisgICAgICAgICAgICAgICAgICAgIGludmFsaWRhdGVDYWNoZWRBZGRy ZXNzVGVtcFJlZ2lzdGVyKCk7CiAgICAgICAgICAgICAgICAgaWYgKChkZXN0MSA9PSBkYXRhVGVt cFJlZ2lzdGVyKSB8fCAoZGVzdDIgPT0gZGF0YVRlbXBSZWdpc3RlcikpCiAgICAgICAgICAgICAg ICAgICAgIGNhY2hlZERhdGFUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7CiAgICAgICAgICAg ICAgICAgbV9hc3NlbWJsZXIubGRyZChkZXN0MSwgZGVzdDIsIGFkZHJlc3MuYmFzZSwgYWRkcmVz cy51Lm9mZnNldCwgLyogaW5kZXg6ICovIHRydWUsIC8qIHdiYWNrOiAqLyBmYWxzZSk7CkBAIC0x NjY1LDcgKzE2NzAsNyBAQCBwdWJsaWM6CiAgICAgICAgIGlmIChkZXN0ID09IGRhdGFUZW1wUmVn aXN0ZXIpCiAgICAgICAgICAgICBjYWNoZWREYXRhVGVtcFJlZ2lzdGVyKCkuaW52YWxpZGF0ZSgp OwogICAgICAgICBlbHNlIGlmIChkZXN0ID09IGFkZHJlc3NUZW1wUmVnaXN0ZXIpCi0gICAgICAg ICAgICBjYWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCkuaW52YWxpZGF0ZSgpOworICAgICAgICAg ICAgaW52YWxpZGF0ZUNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKTsKICAgICB9CiAKICAgICB2 b2lkIG1vdmUoVHJ1c3RlZEltbVB0ciBpbW0sIFJlZ2lzdGVySUQgZGVzdCkKQEAgLTIwNTQsNyAr MjA1OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGZhckp1bXAoUmVnaXN0ZXJJRCB0YXJnZXQsIFB0 clRhZykKICAgICB7CiAgICAgICAgIGNhY2hlZERhdGFUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRl KCk7Ci0gICAgICAgIGNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7Cisg ICAgICAgIGludmFsaWRhdGVDYWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCk7CiAgICAgICAgIG1f YXNzZW1ibGVyLmJ4KHRhcmdldCk7CiAgICAgfQogCkBAIC0yMDYyLDcgKzIwNjcsNyBAQCBwdWJs aWM6CiAgICAgewogICAgICAgICBtb3ZlKHRhcmdldCwgYWRkcmVzc1RlbXBSZWdpc3Rlcik7CiAg ICAgICAgIGNhY2hlZERhdGFUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7Ci0gICAgICAgIGNh Y2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7CisgICAgICAgIGludmFsaWRh dGVDYWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCk7CiAgICAgICAgIG1fYXNzZW1ibGVyLmJ4KGFk ZHJlc3NUZW1wUmVnaXN0ZXIpOwogICAgIH0KIApAQCAtMjUyOSw4ICsyNTM0LDggQEAgcHJvdGVj dGVkOgogICAgICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZChzY3JhdGNoLCBhZGRyZXNzLmJh c2UsIGltbSk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIG1vdmUoVHJ1 c3RlZEltbTMyKGFkZHJlc3Mub2Zmc2V0KSwgYWRkcmVzc1RlbXBSZWdpc3Rlcik7Ci0gICAgICAg ICAgICAgICAgY2FjaGVkQWRkcmVzc1RlbXBSZWdpc3RlcigpLmludmFsaWRhdGUoKTsKICAgICAg ICAgICAgICAgICBtX2Fzc2VtYmxlci5hZGQoYWRkcmVzc1RlbXBSZWdpc3RlciwgYWRkcmVzc1Rl bXBSZWdpc3RlciwgYWRkcmVzcy5iYXNlKTsKKyAgICAgICAgICAgICAgICBjYWNoZWRBZGRyZXNz VGVtcFJlZ2lzdGVyKCkuaW52YWxpZGF0ZSgpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICByZXR1cm4gQXJtQWRkcmVzcyhhZGRyZXNzVGVtcFJlZ2lzdGVyLCBhZGRyZXNzLmluZGV4LCBh ZGRyZXNzLnNjYWxlKTsKQEAgLTI2MjAsNiArMjYyNSwxNCBAQCBwcm90ZWN0ZWQ6CiAgICAgICAg IHJldHVybiBtX2NhY2hlZERhdGFUZW1wUmVnaXN0ZXI7CiAgICAgfQogCisgICAgQUxXQVlTX0lO TElORSB2b2lkIGludmFsaWRhdGVDYWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCkKKyAgICB7Cisg ICAgICAgIC8vIFRoaXMgZnVuY3Rpb24gaXMgaW50ZW5kZWQgZm9yIHdoZW4gd2UgYXJlIGV4cGxp Y2l0bHkgdXNpbmcKKyAgICAgICAgLy8gYWRkcmVzc1RlbXBSZWdpc3RlciAoYmVjYXVzZSB0aGUg Y2FsbGVyIHN1cHBsaWVkIGl0KSwgc28gaXQgY2FuCisgICAgICAgIC8vIGlnbm9yZSBtX2FsbG93 U2NyYXRjaFJlZ2lzdGVyLgorICAgICAgICBtX2NhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIuaW52 YWxpZGF0ZSgpOworICAgIH0KKwogICAgIEFMV0FZU19JTkxJTkUgQ2FjaGVkVGVtcFJlZ2lzdGVy JiBjYWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCkKICAgICB7CiAgICAgICAgIFJFTEVBU0VfQVNT RVJUKG1fYWxsb3dTY3JhdGNoUmVnaXN0ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0NhbGxMaW5rSW5mby5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvQ2FsbExpbmtJbmZvLmNwcAppbmRleCA2ZGY3N2I1YTg2YzZkYmViYWM5MzU5ZmE5 NjJhYzliZGQ4NjQ1YzJhLi4wZTkzYTQ2MTA4YWNkMGViYjZmNTdhM2EzYTE0OTRjNjk2MDJlYjYw IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ2FsbExpbmtJbmZv LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ2FsbExpbmtJbmZvLmNw cApAQCAtMzU0LDggKzM1NCw4IEBAIE1hY3JvQXNzZW1ibGVyOjpKdW1wTGlzdCBDYWxsTGlua0lu Zm86OmVtaXRGYXN0UGF0aEltcGwoQ2FsbExpbmtJbmZvKiBjYWxsTGlua0luCiAgICAgICAgICAg ICBzbG93UGF0aC5hcHBlbmQoaml0LmJyYW5jaFB0cihDQ2FsbEhlbHBlcnM6Ok5vdEVxdWFsLCBj YWxsZWVBZGRyZXNzLCBjYWxsZWVHUFIpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IEdQUlJlZyBzY3JhdGNoR1BSID0gaml0LnNjcmF0Y2hSZWdpc3RlcigpOwotICAgICAgICAgICAg aml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKGNhbGxMaW5rSW5mb0dQUiwgb2Zmc2V0 T2ZDYWxsZWUoKSksIHNjcmF0Y2hHUFIpOwogICAgICAgICAgICAgRGlzYWxsb3dNYWNyb1NjcmF0 Y2hSZWdpc3RlclVzYWdlIGRpc2FsbG93U2NyYXRjaChqaXQpOworICAgICAgICAgICAgaml0Lmxv YWRQdHIoQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKGNhbGxMaW5rSW5mb0dQUiwgb2Zmc2V0T2ZDYWxs ZWUoKSksIHNjcmF0Y2hHUFIpOwogICAgICAgICAgICAgZ29Qb2x5bW9ycGhpYyA9IGppdC5icmFu Y2hUZXN0UHRyKENDYWxsSGVscGVyczo6Tm9uWmVybywgc2NyYXRjaEdQUiwgQ0NhbGxIZWxwZXJz OjpUcnVzdGVkSW1tMzIocG9seW1vcnBoaWNDYWxsZWVNYXNrKSk7CiAgICAgICAgICAgICBzbG93 UGF0aC5hcHBlbmQoaml0LmJyYW5jaFB0cihDQ2FsbEhlbHBlcnM6Ok5vdEVxdWFsLCBzY3JhdGNo R1BSLCBjYWxsZWVHUFIpKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9CYXNlbGluZUpJVFJlZ2lzdGVycy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9CYXNlbGluZUpJVFJlZ2lzdGVycy5oCmluZGV4IDFjYzQ2OTg1NzA5MzZjNTI3NTI3MDJm NGQzZmI5ZTllNWUzNTA0YjMuLmUyZjY0YTczNGIzMGQwYmNkZjY1NzNiYzk2NGNhODYyYTI1ZDBi MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQmFzZWxpbmVKSVRSZWdp c3RlcnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Jhc2VsaW5lSklUUmVnaXN0 ZXJzLmgKQEAgLTMxMCw3ICszMTAsNyBAQCBuYW1lc3BhY2UgUHV0QnlWYWwgewogICAgICAgICAg ICAgICAgIEdQUkluZm86OnJlZ1Q1CiAjZWxpZiBDUFUoQVJNX1RIVU1CMikKICAgICAgICAgICAg ICAgICAvLyBXZSBhcmUgYSBiaXQgc2hvcnQgb24gcmVnaXN0ZXJzIG9uIEFSTV9USFVNQjIsIGJ1 dCB3ZSBjYW4ganVzdCBhYm91dCBnZXQgYXdheSB3aXRoIHRoaXMKLSAgICAgICAgICAgICAgICBN YWNyb0Fzc2VtYmxlckFSTXY3OjpzY3JhdGNoUmVnaXN0ZXIoKQorICAgICAgICAgICAgICAgIE1h Y3JvQXNzZW1ibGVyQVJNdjc6OnNfc2NyYXRjaFJlZ2lzdGVyCiAjZWxzZSAvLyBPdGhlciBKU1ZB TFVFMzJfNjQKICAgICAgICAgICAgICAgICBHUFJJbmZvOjpyZWdUOAogI2VuZGlmCg== 454814 2022-03-16 03:15:42 -0700 2022-03-16 05:06:17 -0700 Patch bug-237888-20220316101540.patch text/plain 9369 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi MjkwNjkzZjA2YzUzMGI1MzlmODg4YzE3OGZjZTA0ZjQ0OTY5NzY0Li43MzRkMjMxNmIxYWFhYmUz Mjk1MjczZWEwY2VlZDEwNGQ4Y2IyN2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MyBAQAorMjAyMi0wMy0xNiAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NA aWdhbGlhLmNvbT4KKworICAgICAgICBNYWNyb0Fzc2VtYmxlckFSTXY3OiBCZSBmcmllbmRsaWVy IHRvIERpc2FsbG93TWFjcm9TY3JhdGNoUmVnaXN0ZXJVc2FnZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3ODg4CisKKyAgICAgICAgUmV2aWV3ZWQg Ynkgxb1hbiBEb2JlcsWhZWsuCisKKyAgICAgICAgT25seSBjaGVjayB0aGF0IHdlJ3JlIGFsbG93 ZWQgdG8gdXNlIHRoZSBzY3JhdGNoIHJlZ2lzdGVyIGF0IHNpdGVzCisgICAgICAgIHdoZXJlIHdl J3JlIHVzaW5nIGl0IGltcGxpY2l0bHkuIFdoZW4gaXQncyBleHBsaWNpdGx5IHBhc3NlZCBpbiBi eSB0aGUKKyAgICAgICAgY2FsbGVyLCB1c2UgaW52YWxpZGF0ZUNhY2hlZEFkZHJlc3NUZW1wUmVn aXN0ZXIgdG8gaW52YWxpZGF0ZSBpdAorICAgICAgICB3aXRob3V0IGFzc2VydGluZyBhbnl0aGlu ZyBhYm91dCBtX2FsbG93U2NyYXRjaFJlZ2lzdGVyLgorCisgICAgICAgIFNpbmNlIGhlbHBlcnMg Y2FuIGV4cGxpY3RseSBtYWtlIHVzZSBvZiBhZGRyZXNzVGVtcFJlZ2lzdGVyLCBhbgorICAgICAg ICBhcmd1bWVudCBjYW4gYmUgbWFkZSB0aGF0IHRoaXMgaXMgc3RpbGwgZnJhZ2lsZSAoaS5lLiBm dXR1cmUgY2hhbmdlcworICAgICAgICBjb3VsZCBydW4gaW50byB0aGlzKS4gVGhlIGFsdGVybmF0 aXZlIHdvdWxkIGJlIHRvIGhhdmUgdGhlIHRvcG1vc3QgY2FsbGVyCisgICAgICAgIGRvIGZpbmUt Z3JhaW5lZCBtYW5hZ2VtZW50IG9mIERpc2FsbG93TWFjcm9TY3JhdGNoUmVnaXN0ZXJVc2FnZSwK KyAgICAgICAgYWxsb3dpbmcgaXQgYXJvdW5kIGV4cGxpY2l0IGNhbGxzIHRvIE1hY3JvQXNzZW1i bGVyQVJNdjcgd2l0aAorICAgICAgICBzY3JhdGNoUmVnaXN0ZXIoKSBpbiB0aGUgYXJndW1lbnRz IGFuZCBkaXNhbGxvd2luZyBpdCBmb3IgaGVscGVycy4KKworICAgICAgICBBcyB0aGVyZSBhcmUg Y3VycmVudGx5IG5vIGhlbHBlcnMgdGhhdCB3b3VsZCB0cmlwIHRoaXMsIHRoaXMgcGF0Y2ggb3B0 cworICAgICAgICBmb3IgdGhlIGZvcm1lciBhcHByb2FjaCwgdG8gbWFrZSBEaXNhbGxvd01hY3Jv U2NyYXRjaFJlZ2lzdGVyVXNhZ2UKKyAgICAgICAgZWFzaWVyIHRvIHdvcmsgd2l0aCAodGhlcmUn bGwgYmUgbW9yZSB1c2FnZSBvZiB0aGUgQVBJIGluIGFuIHVwY29taW5nCisgICAgICAgIHdhc20z MiBwYXRjaCkuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oOgor ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3OjpzY3JhdGNoUmVnaXN0ZXIpOgorICAg ICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3Ojpsb2FkMzIpOgorICAgICAgICAoSlNDOjpN YWNyb0Fzc2VtYmxlckFSTXY3Ojpsb2FkMTYpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxl ckFSTXY3Ojpsb2FkMTZTaWduZWRFeHRlbmRUbzMyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJBUk12Nzo6bG9hZDgpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3Ojps b2FkOFNpZ25lZEV4dGVuZFRvMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3 Ojpsb2FkUGFpcjMyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk12Nzo6bW92ZSk6 CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNdjc6OmZhckp1bXApOgorICAgICAgICAo SlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3OjpzZXR1cEFybUFkZHJlc3MpOgorICAgICAgICAoSlND OjpNYWNyb0Fzc2VtYmxlckFSTXY3OjppbnZhbGlkYXRlQ2FjaGVkQWRkcmVzc1RlbXBSZWdpc3Rl cik6CisgICAgICAgICogYnl0ZWNvZGUvQ2FsbExpbmtJbmZvLmNwcDoKKyAgICAgICAgKEpTQzo6 Q2FsbExpbmtJbmZvOjplbWl0RmFzdFBhdGhJbXBsKToKKyAgICAgICAgKiBqaXQvQmFzZWxpbmVK SVRSZWdpc3RlcnMuaDoKKwogMjAyMi0wMy0xNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBw bGUuY29tPgogCiAgICAgICAgIFtKU0NdIEFkZCBVbmxpbmtlZERGRyBjb21waWxhdGlvbiBtb2Rl IGVudW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJBUk12Ny5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlckFSTXY3LmgKaW5kZXggNDBkODkzMGQ3YmNkOGZlM2NmZmZhNmIxNzkwZjAzMjc4ZTFh N2Q0Ny4uZmU3ZjJkNWM0ZjNmYjQxYzFkMzU1ZWU5NDRkZGQ1YTVhZTE0MDA4YiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3 LmgKQEAgLTc4LDcgKzc4LDEyIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3RleHByIHVuc2ln bmVkIG51bUdQUnMgPSBzdGQ6OmluaXRpYWxpemVyX2xpc3Q8aW50Pih7IEZPUl9FQUNIX0dQX1JF R0lTVEVSKERVTU1ZX1JFR0lTVEVSX1ZBTFVFKSB9KS5zaXplKCk7CiAgICAgc3RhdGljIGNvbnN0 ZXhwciB1bnNpZ25lZCBudW1GUFJzID0gc3RkOjppbml0aWFsaXplcl9saXN0PGludD4oeyBGT1Jf RUFDSF9GUF9SRUdJU1RFUihEVU1NWV9SRUdJU1RFUl9WQUxVRSkgfSkuc2l6ZSgpOwogI3VuZGVm IERVTU1ZX1JFR0lTVEVSX1ZBTFVFCi0gICAgc3RhdGljIGNvbnN0ZXhwciBSZWdpc3RlcklEIHNj cmF0Y2hSZWdpc3RlcigpIHsgcmV0dXJuIGFkZHJlc3NUZW1wUmVnaXN0ZXI7IH0KKyAgICBzdGF0 aWMgY29uc3RleHByIFJlZ2lzdGVySUQgc19zY3JhdGNoUmVnaXN0ZXIgPSBhZGRyZXNzVGVtcFJl Z2lzdGVyOworICAgIFJlZ2lzdGVySUQgc2NyYXRjaFJlZ2lzdGVyKCkKKyAgICB7CisgICAgICAg IFJFTEVBU0VfQVNTRVJUKG1fYWxsb3dTY3JhdGNoUmVnaXN0ZXIpOworICAgICAgICByZXR1cm4g c19zY3JhdGNoUmVnaXN0ZXI7CisgICAgfQogCiAgICAgTWFjcm9Bc3NlbWJsZXJBUk12NygpCiAg ICAgICAgIDogbV9tYWtlSnVtcFBhdGNoYWJsZShmYWxzZSkKQEAgLTY3OSw3ICs2ODQsNyBAQCBw cml2YXRlOgogICAgIHZvaWQgbG9hZDMyKEFybUFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJRCBk ZXN0KQogICAgIHsKICAgICAgICAgaWYgKGRlc3QgPT0gYWRkcmVzc1RlbXBSZWdpc3RlcikKLSAg ICAgICAgICAgIGNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7CisgICAg ICAgICAgICBpbnZhbGlkYXRlQ2FjaGVkQWRkcmVzc1RlbXBSZWdpc3RlcigpOwogICAgICAgICBl bHNlIGlmIChkZXN0ID09IGRhdGFUZW1wUmVnaXN0ZXIpCiAgICAgICAgICAgICBjYWNoZWREYXRh VGVtcFJlZ2lzdGVyKCkuaW52YWxpZGF0ZSgpOwogCkBAIC02OTgsNyArNzAzLDcgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGxvYWQxNihBcm1BZGRyZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkK ICAgICB7CiAgICAgICAgIGlmIChkZXN0ID09IGFkZHJlc3NUZW1wUmVnaXN0ZXIpCi0gICAgICAg ICAgICBjYWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCkuaW52YWxpZGF0ZSgpOworICAgICAgICAg ICAgaW52YWxpZGF0ZUNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKTsKICAgICAgICAgZWxzZSBp ZiAoZGVzdCA9PSBkYXRhVGVtcFJlZ2lzdGVyKQogICAgICAgICAgICAgY2FjaGVkRGF0YVRlbXBS ZWdpc3RlcigpLmludmFsaWRhdGUoKTsKIApAQCAtNzE4LDcgKzcyMyw3IEBAIHByaXZhdGU6CiAg ICAgewogICAgICAgICBBU1NFUlQoYWRkcmVzcy50eXBlID09IEFybUFkZHJlc3M6Okhhc0luZGV4 KTsKICAgICAgICAgaWYgKGRlc3QgPT0gYWRkcmVzc1RlbXBSZWdpc3RlcikKLSAgICAgICAgICAg IGNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7CisgICAgICAgICAgICBp bnZhbGlkYXRlQ2FjaGVkQWRkcmVzc1RlbXBSZWdpc3RlcigpOwogICAgICAgICBlbHNlIGlmIChk ZXN0ID09IGRhdGFUZW1wUmVnaXN0ZXIpCiAgICAgICAgICAgICBjYWNoZWREYXRhVGVtcFJlZ2lz dGVyKCkuaW52YWxpZGF0ZSgpOwogCkBAIC03MjgsNyArNzMzLDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIGxvYWQ4KEFybUFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAg ICAgICAgaWYgKGRlc3QgPT0gYWRkcmVzc1RlbXBSZWdpc3RlcikKLSAgICAgICAgICAgIGNhY2hl ZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7CisgICAgICAgICAgICBpbnZhbGlk YXRlQ2FjaGVkQWRkcmVzc1RlbXBSZWdpc3RlcigpOwogICAgICAgICBlbHNlIGlmIChkZXN0ID09 IGRhdGFUZW1wUmVnaXN0ZXIpCiAgICAgICAgICAgICBjYWNoZWREYXRhVGVtcFJlZ2lzdGVyKCku aW52YWxpZGF0ZSgpOwogCkBAIC03NDgsNyArNzUzLDcgQEAgcHJpdmF0ZToKICAgICB7CiAgICAg ICAgIEFTU0VSVChhZGRyZXNzLnR5cGUgPT0gQXJtQWRkcmVzczo6SGFzSW5kZXgpOwogICAgICAg ICBpZiAoZGVzdCA9PSBhZGRyZXNzVGVtcFJlZ2lzdGVyKQotICAgICAgICAgICAgY2FjaGVkQWRk cmVzc1RlbXBSZWdpc3RlcigpLmludmFsaWRhdGUoKTsKKyAgICAgICAgICAgIGludmFsaWRhdGVD YWNoZWRBZGRyZXNzVGVtcFJlZ2lzdGVyKCk7CiAgICAgICAgIGVsc2UgaWYgKGRlc3QgPT0gZGF0 YVRlbXBSZWdpc3RlcikKICAgICAgICAgICAgIGNhY2hlZERhdGFUZW1wUmVnaXN0ZXIoKS5pbnZh bGlkYXRlKCk7CiAKQEAgLTkzMyw3ICs5MzgsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAg YWJzT2Zmc2V0ID0gLWFic09mZnNldDsKICAgICAgICAgICAgIGlmICghKGFic09mZnNldCAmIH4w eDNmYykpIHsKICAgICAgICAgICAgICAgICBpZiAoKGRlc3QxID09IGFkZHJlc3NUZW1wUmVnaXN0 ZXIpIHx8IChkZXN0MiA9PSBhZGRyZXNzVGVtcFJlZ2lzdGVyKSkKLSAgICAgICAgICAgICAgICAg ICAgY2FjaGVkQWRkcmVzc1RlbXBSZWdpc3RlcigpLmludmFsaWRhdGUoKTsKKyAgICAgICAgICAg ICAgICAgICAgaW52YWxpZGF0ZUNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKTsKICAgICAgICAg ICAgICAgICBpZiAoKGRlc3QxID09IGRhdGFUZW1wUmVnaXN0ZXIpIHx8IChkZXN0MiA9PSBkYXRh VGVtcFJlZ2lzdGVyKSkKICAgICAgICAgICAgICAgICAgICAgY2FjaGVkRGF0YVRlbXBSZWdpc3Rl cigpLmludmFsaWRhdGUoKTsKICAgICAgICAgICAgICAgICBtX2Fzc2VtYmxlci5sZHJkKGRlc3Qx LCBkZXN0MiwgYWRkcmVzcy5iYXNlLCBhZGRyZXNzLnUub2Zmc2V0LCAvKiBpbmRleDogKi8gdHJ1 ZSwgLyogd2JhY2s6ICovIGZhbHNlKTsKQEAgLTE2NjUsNyArMTY3MCw3IEBAIHB1YmxpYzoKICAg ICAgICAgaWYgKGRlc3QgPT0gZGF0YVRlbXBSZWdpc3RlcikKICAgICAgICAgICAgIGNhY2hlZERh dGFUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7CiAgICAgICAgIGVsc2UgaWYgKGRlc3QgPT0g YWRkcmVzc1RlbXBSZWdpc3RlcikKLSAgICAgICAgICAgIGNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0 ZXIoKS5pbnZhbGlkYXRlKCk7CisgICAgICAgICAgICBpbnZhbGlkYXRlQ2FjaGVkQWRkcmVzc1Rl bXBSZWdpc3RlcigpOwogICAgIH0KIAogICAgIHZvaWQgbW92ZShUcnVzdGVkSW1tUHRyIGltbSwg UmVnaXN0ZXJJRCBkZXN0KQpAQCAtMjA1NCw3ICsyMDU5LDcgQEAgcHVibGljOgogICAgIHZvaWQg ZmFySnVtcChSZWdpc3RlcklEIHRhcmdldCwgUHRyVGFnKQogICAgIHsKICAgICAgICAgY2FjaGVk RGF0YVRlbXBSZWdpc3RlcigpLmludmFsaWRhdGUoKTsKLSAgICAgICAgY2FjaGVkQWRkcmVzc1Rl bXBSZWdpc3RlcigpLmludmFsaWRhdGUoKTsKKyAgICAgICAgaW52YWxpZGF0ZUNhY2hlZEFkZHJl c3NUZW1wUmVnaXN0ZXIoKTsKICAgICAgICAgbV9hc3NlbWJsZXIuYngodGFyZ2V0KTsKICAgICB9 CiAKQEAgLTIwNjIsNyArMjA2Nyw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIG1vdmUodGFy Z2V0LCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKICAgICAgICAgY2FjaGVkRGF0YVRlbXBSZWdpc3Rl cigpLmludmFsaWRhdGUoKTsKLSAgICAgICAgY2FjaGVkQWRkcmVzc1RlbXBSZWdpc3RlcigpLmlu dmFsaWRhdGUoKTsKKyAgICAgICAgaW52YWxpZGF0ZUNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIo KTsKICAgICAgICAgbV9hc3NlbWJsZXIuYngoYWRkcmVzc1RlbXBSZWdpc3Rlcik7CiAgICAgfQog CkBAIC0yNTI5LDggKzI1MzQsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgICAgICAgICAgbV9hc3Nl bWJsZXIuYWRkKHNjcmF0Y2gsIGFkZHJlc3MuYmFzZSwgaW1tKTsKICAgICAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1tMzIoYWRkcmVzcy5vZmZzZXQpLCBh ZGRyZXNzVGVtcFJlZ2lzdGVyKTsKLSAgICAgICAgICAgICAgICBjYWNoZWRBZGRyZXNzVGVtcFJl Z2lzdGVyKCkuaW52YWxpZGF0ZSgpOwogICAgICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZChh ZGRyZXNzVGVtcFJlZ2lzdGVyLCBhZGRyZXNzVGVtcFJlZ2lzdGVyLCBhZGRyZXNzLmJhc2UpOwor ICAgICAgICAgICAgICAgIGNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIoKS5pbnZhbGlkYXRlKCk7 CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHJldHVybiBBcm1BZGRyZXNzKGFkZHJlc3NU ZW1wUmVnaXN0ZXIsIGFkZHJlc3MuaW5kZXgsIGFkZHJlc3Muc2NhbGUpOwpAQCAtMjYyMCw2ICsy NjI1LDE0IEBAIHByb3RlY3RlZDoKICAgICAgICAgcmV0dXJuIG1fY2FjaGVkRGF0YVRlbXBSZWdp c3RlcjsKICAgICB9CiAKKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgaW52YWxpZGF0ZUNhY2hlZEFk ZHJlc3NUZW1wUmVnaXN0ZXIoKQorICAgIHsKKyAgICAgICAgLy8gVGhpcyBmdW5jdGlvbiBpcyBp bnRlbmRlZCBmb3Igd2hlbiB3ZSBhcmUgZXhwbGljaXRseSB1c2luZworICAgICAgICAvLyBhZGRy ZXNzVGVtcFJlZ2lzdGVyIChiZWNhdXNlIHRoZSBjYWxsZXIgc3VwcGxpZWQgaXQpLCBzbyBpdCBj YW4KKyAgICAgICAgLy8gaWdub3JlIG1fYWxsb3dTY3JhdGNoUmVnaXN0ZXIuCisgICAgICAgIG1f Y2FjaGVkQWRkcmVzc1RlbXBSZWdpc3Rlci5pbnZhbGlkYXRlKCk7CisgICAgfQorCiAgICAgQUxX QVlTX0lOTElORSBDYWNoZWRUZW1wUmVnaXN0ZXImIGNhY2hlZEFkZHJlc3NUZW1wUmVnaXN0ZXIo KQogICAgIHsKICAgICAgICAgUkVMRUFTRV9BU1NFUlQobV9hbGxvd1NjcmF0Y2hSZWdpc3Rlcik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ2FsbExpbmtJbmZv LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9DYWxsTGlua0luZm8uY3BwCmlu ZGV4IDZkZjc3YjVhODZjNmRiZWJhYzkzNTlmYTk2MmFjOWJkZDg2NDVjMmEuLjBlOTNhNDYxMDhh Y2QwZWJiNmY1N2EzYTNhMTQ5NGM2OTYwMmViNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9DYWxsTGlua0luZm8uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9DYWxsTGlua0luZm8uY3BwCkBAIC0zNTQsOCArMzU0LDggQEAgTWFjcm9B c3NlbWJsZXI6Okp1bXBMaXN0IENhbGxMaW5rSW5mbzo6ZW1pdEZhc3RQYXRoSW1wbChDYWxsTGlu a0luZm8qIGNhbGxMaW5rSW4KICAgICAgICAgICAgIHNsb3dQYXRoLmFwcGVuZChqaXQuYnJhbmNo UHRyKENDYWxsSGVscGVyczo6Tm90RXF1YWwsIGNhbGxlZUFkZHJlc3MsIGNhbGxlZUdQUikpOwog ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgR1BSUmVnIHNjcmF0Y2hHUFIgPSBqaXQuc2Ny YXRjaFJlZ2lzdGVyKCk7Ci0gICAgICAgICAgICBqaXQubG9hZFB0cihDQ2FsbEhlbHBlcnM6OkFk ZHJlc3MoY2FsbExpbmtJbmZvR1BSLCBvZmZzZXRPZkNhbGxlZSgpKSwgc2NyYXRjaEdQUik7CiAg ICAgICAgICAgICBEaXNhbGxvd01hY3JvU2NyYXRjaFJlZ2lzdGVyVXNhZ2UgZGlzYWxsb3dTY3Jh dGNoKGppdCk7CisgICAgICAgICAgICBqaXQubG9hZFB0cihDQ2FsbEhlbHBlcnM6OkFkZHJlc3Mo Y2FsbExpbmtJbmZvR1BSLCBvZmZzZXRPZkNhbGxlZSgpKSwgc2NyYXRjaEdQUik7CiAgICAgICAg ICAgICBnb1BvbHltb3JwaGljID0gaml0LmJyYW5jaFRlc3RQdHIoQ0NhbGxIZWxwZXJzOjpOb25a ZXJvLCBzY3JhdGNoR1BSLCBDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW0zMihwb2x5bW9ycGhpY0Nh bGxlZU1hc2spKTsKICAgICAgICAgICAgIHNsb3dQYXRoLmFwcGVuZChqaXQuYnJhbmNoUHRyKEND YWxsSGVscGVyczo6Tm90RXF1YWwsIHNjcmF0Y2hHUFIsIGNhbGxlZUdQUikpOwogICAgICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Jhc2VsaW5lSklUUmVnaXN0 ZXJzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Jhc2VsaW5lSklUUmVnaXN0ZXJzLmgK aW5kZXggMWNjNDY5ODU3MDkzNmM1Mjc1MjcwMmY0ZDNmYjllOWU1ZTM1MDRiMy4uZTJmNjRhNzM0 YjMwZDBiY2RmNjU3M2JjOTY0Y2E4NjJhMjVkMGIzNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9CYXNlbGluZUpJVFJlZ2lzdGVycy5oCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvQmFzZWxpbmVKSVRSZWdpc3RlcnMuaApAQCAtMzEwLDcgKzMxMCw3IEBAIG5h bWVzcGFjZSBQdXRCeVZhbCB7CiAgICAgICAgICAgICAgICAgR1BSSW5mbzo6cmVnVDUKICNlbGlm IENQVShBUk1fVEhVTUIyKQogICAgICAgICAgICAgICAgIC8vIFdlIGFyZSBhIGJpdCBzaG9ydCBv biByZWdpc3RlcnMgb24gQVJNX1RIVU1CMiwgYnV0IHdlIGNhbiBqdXN0IGFib3V0IGdldCBhd2F5 IHdpdGggdGhpcwotICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyQVJNdjc6OnNjcmF0Y2hS ZWdpc3RlcigpCisgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXJBUk12Nzo6c19zY3JhdGNo UmVnaXN0ZXIKICNlbHNlIC8vIE90aGVyIEpTVkFMVUUzMl82NAogICAgICAgICAgICAgICAgIEdQ UkluZm86OnJlZ1Q4CiAjZW5kaWYK