233251 2021-11-17 05:23:30 -0800 MacroAssembler: remove unused load/store methods for addresses with patchable offsets 2022-03-11 05:33:46 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 237775 1 zan zan ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1815900 0 zan 2021-11-17 05:23:30 -0800 MacroAssembler: remove unused load/store methods for addresses with patchable offsets 1815901 1 444510 zan 2021-11-17 05:25:24 -0800 Created attachment 444510 Patch 1817621 2 webkit-bug-importer 2021-11-24 05:24:22 -0800 <rdar://problem/85726129> 1817715 3 444510 ysuzuki 2021-11-24 16:09:19 -0800 Comment on attachment 444510 Patch r=me 1817718 4 ews-feeder 2021-11-24 16:32:37 -0800 Committed r286155 (244539@main): <https://commits.webkit.org/244539@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444510. 444510 2021-11-17 05:25:24 -0800 2021-11-24 16:32:38 -0800 Patch bug-233251-20211117142523.patch text/plain 11428 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm MWU4ZjJhMTY2MGE0NDU5M2E2Njk0Y2JkNjk0MjU5YjY2MDk0ZjUzLi42YzFmYjc0MjQwZTZkN2Y0 MWQ0ZmVlNjgxNmQ2NTRiOWQ2NjkwMmM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAyMS0xMS0xNyAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5j b20+CisKKyAgICAgICAgTWFjcm9Bc3NlbWJsZXI6IHJlbW92ZSB1bnVzZWQgbG9hZC9zdG9yZSBt ZXRob2RzIGZvciBhZGRyZXNzZXMgd2l0aCBwYXRjaGFibGUgb2Zmc2V0cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMjUxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIE1hY3JvQXNzZW1ibGVy IG1ldGhvZHMgZm9yIGxvYWQgYW5kIHN0b3JlIG9wZXJhdGlvbnMgb24gYWRkcmVzc2VzCisgICAg ICAgIHdpdGggcGF0Y2hhYmxlIG9mZnNldCB2YWx1ZXMgYXMgdGhleSdyZSBub3QgdXNlZCBpbiBh bnkgcGxhY2UgYW55bW9yZS4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlci5o OgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlcjo6bG9hZFB0cldpdGhBZGRyZXNzT2Zmc2V0 UGF0Y2gpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlcjo6bG9hZFB0cldp dGhDb21wYWN0QWRkcmVzc09mZnNldFBhdGNoKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6TWFj cm9Bc3NlbWJsZXI6OnN0b3JlUHRyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaCk6IERlbGV0ZWQuCisg ICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaDoKKyAgICAgICAgKEpTQzo6 TWFjcm9Bc3NlbWJsZXJBUk02NDo6bG9hZDMyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaCk6IERlbGV0 ZWQuCisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6OmxvYWQzMldpdGhDb21wYWN0 QWRkcmVzc09mZnNldFBhdGNoKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJs ZXJBUk02NDo6c3RvcmUzMldpdGhBZGRyZXNzT2Zmc2V0UGF0Y2gpOiBEZWxldGVkLgorICAgICAg ICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3Lmg6CisgICAgICAgIChKU0M6Ok1hY3Jv QXNzZW1ibGVyQVJNdjc6OmxvYWQzMldpdGhBZGRyZXNzT2Zmc2V0UGF0Y2gpOiBEZWxldGVkLgor ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3Ojpsb2FkMzJXaXRoQ29tcGFjdEFkZHJl c3NPZmZzZXRQYXRjaCk6IERlbGV0ZWQuCisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJN djc6OnN0b3JlMzJXaXRoQWRkcmVzc09mZnNldFBhdGNoKTogRGVsZXRlZC4KKyAgICAgICAgKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyTUlQUzo6bG9hZDMyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaCk6IERlbGV0ZWQuCisgICAgICAg IChKU0M6Ok1hY3JvQXNzZW1ibGVyTUlQUzo6bG9hZDMyV2l0aENvbXBhY3RBZGRyZXNzT2Zmc2V0 UGF0Y2gpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlck1JUFM6OnN0b3Jl MzJXaXRoQWRkcmVzc09mZnNldFBhdGNoKTogRGVsZXRlZC4KKyAgICAgICAgKiBhc3NlbWJsZXIv TWFjcm9Bc3NlbWJsZXJYODZDb21tb24uaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJY ODZDb21tb246OmxvYWQzMldpdGhBZGRyZXNzT2Zmc2V0UGF0Y2gpOiBEZWxldGVkLgorICAgICAg ICAoSlNDOjpNYWNyb0Fzc2VtYmxlclg4NkNvbW1vbjo6bG9hZDMyV2l0aENvbXBhY3RBZGRyZXNz T2Zmc2V0UGF0Y2gpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclg4NkNv bW1vbjo6c3RvcmUzMldpdGhBZGRyZXNzT2Zmc2V0UGF0Y2gpOiBEZWxldGVkLgorCiAyMDIxLTEx LTE1ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10g VXNlIG9wZXJhdGlvbiBwYXRoIHdoZW4gUHV0QnlWYWwgY2hpbGQxIGlzIG5vdCBzcGVjdWxhdGVk IGFzIGEgQ2VsbApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9N YWNyb0Fzc2VtYmxlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlci5oCmluZGV4IDQxMzIzMDJmOGE4NjAxOTRhMmQ4OGQ4N2Y4YWYwOGY2NmUxMmU4MTEu LmZiMTg2MmM2Mzc1N2RjYzI0ZDk0MDY4YTJmM2U0MGY4MmNkOTkyN2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuaAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyLmgKQEAgLTczNSwxNiAr NzM1LDYgQEAgcHVibGljOgogICAgIH0KICNlbmRpZgogCi0gICAgRGF0YUxhYmVsMzIgbG9hZFB0 cldpdGhBZGRyZXNzT2Zmc2V0UGF0Y2goQWRkcmVzcyBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3Qp Ci0gICAgewotICAgICAgICByZXR1cm4gbG9hZDMyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaChhZGRy ZXNzLCBkZXN0KTsKLSAgICB9Ci0gICAgCi0gICAgRGF0YUxhYmVsQ29tcGFjdCBsb2FkUHRyV2l0 aENvbXBhY3RBZGRyZXNzT2Zmc2V0UGF0Y2goQWRkcmVzcyBhZGRyZXNzLCBSZWdpc3RlcklEIGRl c3QpCi0gICAgewotICAgICAgICByZXR1cm4gbG9hZDMyV2l0aENvbXBhY3RBZGRyZXNzT2Zmc2V0 UGF0Y2goYWRkcmVzcywgZGVzdCk7Ci0gICAgfQotICAgIAogICAgIHZvaWQgY29tcGFyZVB0cihS ZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQsIFJlZ2lzdGVySUQgbGVmdCwgVHJ1c3RlZEltbTMyIHJp Z2h0LCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBjb21wYXJlMzIoY29uZCwgbGVm dCwgcmlnaHQsIGRlc3QpOwpAQCAtNzk1LDExICs3ODUsNiBAQCBwdWJsaWM6CiAgICAgICAgIHN0 b3JlMzIoVHJ1c3RlZEltbTMyKGltbSksIGFkZHJlc3MpOwogICAgIH0KIAotICAgIERhdGFMYWJl bDMyIHN0b3JlUHRyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaChSZWdpc3RlcklEIHNyYywgQWRkcmVz cyBhZGRyZXNzKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHN0b3JlMzJXaXRoQWRkcmVzc09mZnNl dFBhdGNoKHNyYywgYWRkcmVzcyk7Ci0gICAgfQotCiAgICAgSnVtcCBicmFuY2hQdHIoUmVsYXRp b25hbENvbmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIGxlZnQsIFJlZ2lzdGVySUQgcmlnaHQpCiAg ICAgewogICAgICAgICByZXR1cm4gYnJhbmNoMzIoY29uZCwgbGVmdCwgcmlnaHQpOwpAQCAtMTA4 MiwxNiArMTA2Nyw2IEBAIHB1YmxpYzoKICAgICB9CiAjZW5kaWYKIAotICAgIERhdGFMYWJlbDMy IGxvYWRQdHJXaXRoQWRkcmVzc09mZnNldFBhdGNoKEFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJ RCBkZXN0KQotICAgIHsKLSAgICAgICAgcmV0dXJuIGxvYWQ2NFdpdGhBZGRyZXNzT2Zmc2V0UGF0 Y2goYWRkcmVzcywgZGVzdCk7Ci0gICAgfQotICAgIAotICAgIERhdGFMYWJlbENvbXBhY3QgbG9h ZFB0cldpdGhDb21wYWN0QWRkcmVzc09mZnNldFBhdGNoKEFkZHJlc3MgYWRkcmVzcywgUmVnaXN0 ZXJJRCBkZXN0KQotICAgIHsKLSAgICAgICAgcmV0dXJuIGxvYWQ2NFdpdGhDb21wYWN0QWRkcmVz c09mZnNldFBhdGNoKGFkZHJlc3MsIGRlc3QpOwotICAgIH0KLQogICAgIHZvaWQgc3RvcmVQdHIo UmVnaXN0ZXJJRCBzcmMsIEFkZHJlc3MgYWRkcmVzcykKICAgICB7CiAgICAgICAgIHN0b3JlNjQo c3JjLCBhZGRyZXNzKTsKQEAgLTExMjIsMTEgKzEwOTcsNiBAQCBwdWJsaWM6CiAgICAgICAgIHN0 b3JlNjQoVHJ1c3RlZEltbTY0KGltbSksIGFkZHJlc3MpOwogICAgIH0KIAotICAgIERhdGFMYWJl bDMyIHN0b3JlUHRyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaChSZWdpc3RlcklEIHNyYywgQWRkcmVz cyBhZGRyZXNzKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHN0b3JlNjRXaXRoQWRkcmVzc09mZnNl dFBhdGNoKHNyYywgYWRkcmVzcyk7Ci0gICAgfQotCiAgICAgdm9pZCBjb21wYXJlUHRyKFJlbGF0 aW9uYWxDb25kaXRpb24gY29uZCwgUmVnaXN0ZXJJRCBsZWZ0LCBUcnVzdGVkSW1tMzIgcmlnaHQs IFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAgIGNvbXBhcmU2NChjb25kLCBsZWZ0LCBy aWdodCwgZGVzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L01hY3JvQXNzZW1ibGVyQVJNNjQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIv TWFjcm9Bc3NlbWJsZXJBUk02NC5oCmluZGV4IDg1NzQwNTVjOWIxZWZiYmJlZWQwMDFlMGVlMDlj YWU1YWExMDg3ZGEuLjRjZmI1ZjIxYzg5YzI1N2UxN2NiYmMzM2FjODRkMjhlNmE4NWRiMjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJB Uk02NC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJs ZXJBUk02NC5oCkBAIC0xNzE1LDIyICsxNzE1LDYgQEAgcHVibGljOgogICAgICAgICBtX2Fzc2Vt Ymxlci5sZHI8MzI+KGRlc3QsIHNyYy5iYXNlLCBQb3N0SW5kZXgoc3JjLmluZGV4KSk7CiAgICAg fQogCi0gICAgRGF0YUxhYmVsMzIgbG9hZDMyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaChBZGRyZXNz IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKLSAgICB7Ci0gICAgICAgIERhdGFMYWJlbDMyIGxh YmVsKHRoaXMpOwotICAgICAgICBzaWduRXh0ZW5kMzJUb1B0cldpdGhGaXhlZFdpZHRoKGFkZHJl c3Mub2Zmc2V0LCBnZXRDYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXJJREFuZEludmFsaWRhdGUoKSk7 Ci0gICAgICAgIG1fYXNzZW1ibGVyLmxkcjwzMj4oZGVzdCwgYWRkcmVzcy5iYXNlLCBtZW1vcnlU ZW1wUmVnaXN0ZXIsIEFzc2VtYmxlcjo6U1hUVywgMCk7Ci0gICAgICAgIHJldHVybiBsYWJlbDsK LSAgICB9Ci0gICAgCi0gICAgRGF0YUxhYmVsQ29tcGFjdCBsb2FkMzJXaXRoQ29tcGFjdEFkZHJl c3NPZmZzZXRQYXRjaChBZGRyZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKLSAgICB7Ci0g ICAgICAgIEFTU0VSVChpc0NvbXBhY3RQdHJBbGlnbmVkQWRkcmVzc09mZnNldChhZGRyZXNzLm9m ZnNldCkpOwotICAgICAgICBEYXRhTGFiZWxDb21wYWN0IGxhYmVsKHRoaXMpOwotICAgICAgICBt X2Fzc2VtYmxlci5sZHI8MzI+KGRlc3QsIGFkZHJlc3MuYmFzZSwgYWRkcmVzcy5vZmZzZXQpOwot ICAgICAgICByZXR1cm4gbGFiZWw7Ci0gICAgfQotCiAgICAgdm9pZCBsb2FkMzJXaXRoVW5hbGln bmVkSGFsZldvcmRzKEJhc2VJbmRleCBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewog ICAgICAgICBsb2FkMzIoYWRkcmVzcywgZGVzdCk7CkBAIC0yMTA3LDE0ICsyMDkxLDYgQEAgcHVi bGljOgogICAgICAgICBtX2Fzc2VtYmxlci5zdHI8MzI+KHNyYywgZGVzdC5iYXNlLCBQb3N0SW5k ZXgoZGVzdC5pbmRleCkpOwogICAgIH0KIAotICAgIERhdGFMYWJlbDMyIHN0b3JlMzJXaXRoQWRk cmVzc09mZnNldFBhdGNoKFJlZ2lzdGVySUQgc3JjLCBBZGRyZXNzIGFkZHJlc3MpCi0gICAgewot ICAgICAgICBEYXRhTGFiZWwzMiBsYWJlbCh0aGlzKTsKLSAgICAgICAgc2lnbkV4dGVuZDMyVG9Q dHJXaXRoRml4ZWRXaWR0aChhZGRyZXNzLm9mZnNldCwgZ2V0Q2FjaGVkTWVtb3J5VGVtcFJlZ2lz dGVySURBbmRJbnZhbGlkYXRlKCkpOwotICAgICAgICBtX2Fzc2VtYmxlci5zdHI8MzI+KHNyYywg YWRkcmVzcy5iYXNlLCBtZW1vcnlUZW1wUmVnaXN0ZXIsIEFzc2VtYmxlcjo6U1hUVywgMCk7Ci0g ICAgICAgIHJldHVybiBsYWJlbDsKLSAgICB9Ci0KICAgICB2b2lkIHN0b3JlMTYoUmVnaXN0ZXJJ RCBzcmMsIEFkZHJlc3MgYWRkcmVzcykKICAgICB7CiAgICAgICAgIGlmICh0cnlTdG9yZVdpdGhP ZmZzZXQ8MTY+KHNyYywgYWRkcmVzcy5iYXNlLCBhZGRyZXNzLm9mZnNldCkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCmlu ZGV4IGY2MTVhNTBjZWU5NWYwZThmYzQwNzE0OWMyNDEwNDlmN2IxNmI2YWEuLjQ4NmY5MWUxMTZj NjA0ZTM1Mzk3NWNlMjUxYzI3NjRjNTUxNDY3YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCkBAIC04MDMsMjYgKzgw Myw2IEBAIHB1YmxpYzoKICAgICAgICAgbG9hZDgoQWRkcmVzcyhkZXN0KSwgZGVzdCk7CiAgICAg fQogCi0gICAgRGF0YUxhYmVsMzIgbG9hZDMyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaChBZGRyZXNz IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKLSAgICB7Ci0gICAgICAgIERhdGFMYWJlbDMyIGxh YmVsID0gbW92ZVdpdGhQYXRjaChUcnVzdGVkSW1tMzIoYWRkcmVzcy5vZmZzZXQpLCBkYXRhVGVt cFJlZ2lzdGVyKTsKLSAgICAgICAgbG9hZDMyKEFybUFkZHJlc3MoYWRkcmVzcy5iYXNlLCBkYXRh VGVtcFJlZ2lzdGVyKSwgZGVzdCk7Ci0gICAgICAgIHJldHVybiBsYWJlbDsKLSAgICB9Ci0gICAg Ci0gICAgRGF0YUxhYmVsQ29tcGFjdCBsb2FkMzJXaXRoQ29tcGFjdEFkZHJlc3NPZmZzZXRQYXRj aChBZGRyZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKLSAgICB7Ci0gICAgICAgIHBhZEJl Zm9yZVBhdGNoKCk7Ci0KLSAgICAgICAgUmVnaXN0ZXJJRCBiYXNlID0gYWRkcmVzcy5iYXNlOwot ICAgICAgICAKLSAgICAgICAgRGF0YUxhYmVsQ29tcGFjdCBsYWJlbCh0aGlzKTsKLSAgICAgICAg QVNTRVJUKGlzQ29tcGFjdFB0ckFsaWduZWRBZGRyZXNzT2Zmc2V0KGFkZHJlc3Mub2Zmc2V0KSk7 Ci0KLSAgICAgICAgbV9hc3NlbWJsZXIubGRyKGRlc3QsIGJhc2UsIGFkZHJlc3Mub2Zmc2V0LCB0 cnVlLCBmYWxzZSk7Ci0gICAgICAgIHJldHVybiBsYWJlbDsKLSAgICB9Ci0KICAgICB2b2lkIGxv YWQxNihjb25zdCB2b2lkKiBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAg ICBtb3ZlKFRydXN0ZWRJbW1QdHIoYWRkcmVzcyksIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwpAQCAt ODczLDEzICs4NTMsNiBAQCBwdWJsaWM6CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBEYXRhTGFi ZWwzMiBzdG9yZTMyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaChSZWdpc3RlcklEIHNyYywgQWRkcmVz cyBhZGRyZXNzKQotICAgIHsKLSAgICAgICAgRGF0YUxhYmVsMzIgbGFiZWwgPSBtb3ZlV2l0aFBh dGNoKFRydXN0ZWRJbW0zMihhZGRyZXNzLm9mZnNldCksIGRhdGFUZW1wUmVnaXN0ZXIpOwotICAg ICAgICBzdG9yZTMyKHNyYywgQXJtQWRkcmVzcyhhZGRyZXNzLmJhc2UsIGRhdGFUZW1wUmVnaXN0 ZXIpKTsKLSAgICAgICAgcmV0dXJuIGxhYmVsOwotICAgIH0KLQogICAgIHZvaWQgc3RvcmUzMihS ZWdpc3RlcklEIHNyYywgQWRkcmVzcyBhZGRyZXNzKQogICAgIHsKICAgICAgICAgc3RvcmUzMihz cmMsIHNldHVwQXJtQWRkcmVzcyhhZGRyZXNzKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAppbmRleCBiODFiNzJmOTJkZTU0 ZjJhMjBhNjg2YTMxNGY4MTg1NjRhZmM5YTY1Li42OWU5MTEwYzAzN2JkY2FjMzUxMDBiYzFmMTZi N2IzZTE4ZTJjMWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L01hY3JvQXNzZW1ibGVyTUlQUy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKQEAgLTExOTIsMzAgKzExOTIsNiBAQCBwdWJsaWM6CiAg ICAgICAgIH0KICAgICB9CiAKLSAgICBEYXRhTGFiZWwzMiBsb2FkMzJXaXRoQWRkcmVzc09mZnNl dFBhdGNoKEFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQotICAgIHsKLSAgICAgICAg bV9maXhlZFdpZHRoID0gdHJ1ZTsKLSAgICAgICAgLyoKLSAgICAgICAgICAgIGx1aSBhZGRyVGVt cCwgYWRkcmVzcy5vZmZzZXQgPj4gMTYKLSAgICAgICAgICAgIG9yaSBhZGRyVGVtcCwgYWRkclRl bXAsIGFkZHJlc3Mub2Zmc2V0ICYgMHhmZmZmCi0gICAgICAgICAgICBhZGR1ICAgICAgICBhZGRy VGVtcCwgYWRkclRlbXAsIGFkZHJlc3MuYmFzZQotICAgICAgICAgICAgbHcgIGRlc3QsIDAoYWRk clRlbXApCi0gICAgICAgICovCi0gICAgICAgIERhdGFMYWJlbDMyIGRhdGFMYWJlbCh0aGlzKTsK LSAgICAgICAgbW92ZShUcnVzdGVkSW1tMzIoYWRkcmVzcy5vZmZzZXQpLCBhZGRyVGVtcFJlZ2lz dGVyKTsKLSAgICAgICAgbV9hc3NlbWJsZXIuYWRkdShhZGRyVGVtcFJlZ2lzdGVyLCBhZGRyVGVt cFJlZ2lzdGVyLCBhZGRyZXNzLmJhc2UpOwotICAgICAgICBtX2Fzc2VtYmxlci5sdyhkZXN0LCBh ZGRyVGVtcFJlZ2lzdGVyLCAwKTsKLSAgICAgICAgbV9maXhlZFdpZHRoID0gZmFsc2U7Ci0gICAg ICAgIHJldHVybiBkYXRhTGFiZWw7Ci0gICAgfQotICAgIAotICAgIERhdGFMYWJlbENvbXBhY3Qg bG9hZDMyV2l0aENvbXBhY3RBZGRyZXNzT2Zmc2V0UGF0Y2goQWRkcmVzcyBhZGRyZXNzLCBSZWdp c3RlcklEIGRlc3QpCi0gICAgewotICAgICAgICBEYXRhTGFiZWxDb21wYWN0IGRhdGFMYWJlbCh0 aGlzKTsKLSAgICAgICAgbG9hZDMyV2l0aEFkZHJlc3NPZmZzZXRQYXRjaChhZGRyZXNzLCBkZXN0 KTsKLSAgICAgICAgcmV0dXJuIGRhdGFMYWJlbDsKLSAgICB9Ci0KICAgICB2b2lkIGxvYWQxNihj b25zdCB2b2lkKiBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBpZiAo bV9maXhlZFdpZHRoKSB7CkBAIC0xMzEwLDIzICsxMjg2LDYgQEAgcHVibGljOgogICAgICAgICB9 CiAgICAgfQogCi0gICAgRGF0YUxhYmVsMzIgc3RvcmUzMldpdGhBZGRyZXNzT2Zmc2V0UGF0Y2go UmVnaXN0ZXJJRCBzcmMsIEFkZHJlc3MgYWRkcmVzcykKLSAgICB7Ci0gICAgICAgIG1fZml4ZWRX aWR0aCA9IHRydWU7Ci0gICAgICAgIC8qCi0gICAgICAgICAgICBsdWkgYWRkclRlbXAsIGFkZHJl c3Mub2Zmc2V0ID4+IDE2Ci0gICAgICAgICAgICBvcmkgYWRkclRlbXAsIGFkZHJUZW1wLCBhZGRy ZXNzLm9mZnNldCAmIDB4ZmZmZgotICAgICAgICAgICAgYWRkdSAgICAgICAgYWRkclRlbXAsIGFk ZHJUZW1wLCBhZGRyZXNzLmJhc2UKLSAgICAgICAgICAgIHN3ICBzcmMsIDAoYWRkclRlbXApCi0g ICAgICAgICovCi0gICAgICAgIERhdGFMYWJlbDMyIGRhdGFMYWJlbCh0aGlzKTsKLSAgICAgICAg bW92ZShUcnVzdGVkSW1tMzIoYWRkcmVzcy5vZmZzZXQpLCBhZGRyVGVtcFJlZ2lzdGVyKTsKLSAg ICAgICAgbV9hc3NlbWJsZXIuYWRkdShhZGRyVGVtcFJlZ2lzdGVyLCBhZGRyVGVtcFJlZ2lzdGVy LCBhZGRyZXNzLmJhc2UpOwotICAgICAgICBtX2Fzc2VtYmxlci5zdyhzcmMsIGFkZHJUZW1wUmVn aXN0ZXIsIDApOwotICAgICAgICBtX2ZpeGVkV2lkdGggPSBmYWxzZTsKLSAgICAgICAgcmV0dXJu IGRhdGFMYWJlbDsKLSAgICB9Ci0KICAgICB2b2lkIHN0b3JlOChSZWdpc3RlcklEIHNyYywgQWRk cmVzcyBhZGRyZXNzKQogICAgIHsKICAgICAgICAgaWYgKGFkZHJlc3Mub2Zmc2V0ID49IC0zMjc2 OCAmJiBhZGRyZXNzLm9mZnNldCA8PSAzMjc2NwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1vbi5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1vbi5oCmluZGV4IDNmYWJj NGQ4OTE0MDQ3NGY0MGYxZmE3YTliMWJhZjliNzA3NmQ2ODAuLjM1ZmI3NTkzMjFmNmY2OWIyMWJh YzdjMDdmZjQ0ZDg1MTg1YWI3YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZDb21tb24uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2Q29tbW9uLmgKQEAgLTEyMzUsMjAgKzEy MzUsNiBAQCBwdWJsaWM6CiAgICAgICAgIGxvYWQxNihhZGRyZXNzLCBkZXN0KTsKICAgICB9CiAK LSAgICBEYXRhTGFiZWwzMiBsb2FkMzJXaXRoQWRkcmVzc09mZnNldFBhdGNoKEFkZHJlc3MgYWRk cmVzcywgUmVnaXN0ZXJJRCBkZXN0KQotICAgIHsKLSAgICAgICAgcGFkQmVmb3JlUGF0Y2goKTsK LSAgICAgICAgbV9hc3NlbWJsZXIubW92bF9tcl9kaXNwMzIoYWRkcmVzcy5vZmZzZXQsIGFkZHJl c3MuYmFzZSwgZGVzdCk7Ci0gICAgICAgIHJldHVybiBEYXRhTGFiZWwzMih0aGlzKTsKLSAgICB9 Ci0gICAgCi0gICAgRGF0YUxhYmVsQ29tcGFjdCBsb2FkMzJXaXRoQ29tcGFjdEFkZHJlc3NPZmZz ZXRQYXRjaChBZGRyZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKLSAgICB7Ci0gICAgICAg IHBhZEJlZm9yZVBhdGNoKCk7Ci0gICAgICAgIG1fYXNzZW1ibGVyLm1vdmxfbXJfZGlzcDgoYWRk cmVzcy5vZmZzZXQsIGFkZHJlc3MuYmFzZSwgZGVzdCk7Ci0gICAgICAgIHJldHVybiBEYXRhTGFi ZWxDb21wYWN0KHRoaXMpOwotICAgIH0KLQogICAgIHRlbXBsYXRlPFB0clRhZyB0YWc+CiAgICAg c3RhdGljIHZvaWQgcmVwYXRjaENvbXBhY3QoQ29kZUxvY2F0aW9uRGF0YUxhYmVsQ29tcGFjdDx0 YWc+IGRhdGFMYWJlbENvbXBhY3QsIGludDMyX3QgdmFsdWUpCiAgICAgewpAQCAtMTM0MCwxMyAr MTMyNiw2IEBAIHB1YmxpYzoKICAgICAgICAgbV9hc3NlbWJsZXIubW92c3dsX3JyKHNyYywgZGVz dCk7CiAgICAgfQogICAgIAotICAgIERhdGFMYWJlbDMyIHN0b3JlMzJXaXRoQWRkcmVzc09mZnNl dFBhdGNoKFJlZ2lzdGVySUQgc3JjLCBBZGRyZXNzIGFkZHJlc3MpCi0gICAgewotICAgICAgICBw YWRCZWZvcmVQYXRjaCgpOwotICAgICAgICBtX2Fzc2VtYmxlci5tb3ZsX3JtX2Rpc3AzMihzcmMs IGFkZHJlc3Mub2Zmc2V0LCBhZGRyZXNzLmJhc2UpOwotICAgICAgICByZXR1cm4gRGF0YUxhYmVs MzIodGhpcyk7Ci0gICAgfQotCiAgICAgdm9pZCBzdG9yZTMyKFJlZ2lzdGVySUQgc3JjLCBBZGRy ZXNzIGFkZHJlc3MpCiAgICAgewogICAgICAgICBtX2Fzc2VtYmxlci5tb3ZsX3JtKHNyYywgYWRk cmVzcy5vZmZzZXQsIGFkZHJlc3MuYmFzZSk7Cg==