238092 2022-03-18 13:46:17 -0700 [JSC] Reduce # of registers used in RegExpTestInline to allow using unlinked DFG in x64 2022-03-18 17:57:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1852817 0 ysuzuki 2022-03-18 13:46:17 -0700 [JSC] Reduce # of registers used in RegExpTestInline to allow using unlinked DFG in x64 1852819 1 455130 ysuzuki 2022-03-18 13:50:42 -0700 Created attachment 455130 Patch 1852831 2 455132 ysuzuki 2022-03-18 14:14:08 -0700 Created attachment 455132 Patch 1852851 3 455132 msaboff 2022-03-18 15:10:36 -0700 Comment on attachment 455132 Patch r=me 1852917 4 ysuzuki 2022-03-18 17:56:12 -0700 Committed r291515 (248621@trunk): <https://commits.webkit.org/248621@trunk> 1852918 5 webkit-bug-importer 2022-03-18 17:57:16 -0700 <rdar://problem/90512935> 455130 2022-03-18 13:50:42 -0700 2022-03-18 14:27:31 -0700 Patch bug-238092-20220318135041.patch text/plain 14117 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh NzQzMWJiZDRhZmUxYTk5ZTUwNjdlMjgyZmFjYTMyZGRmNzMxZmQ0Li5iYTBkZmYwODU0MWRlYzhj MjU0ODZlNjkyYmQ4MzQwMjg5OWYzNDM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMi0wMy0xOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFJlZHVjZSAjIG9mIHJlZ2lzdGVycyB1c2VkIGluIFJlZ0V4cFRl c3RJbmxpbmUgdG8gYWxsb3cgdXNpbmcgdW5saW5rZWQgREZHIGluIHg2NAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDkyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZWR1Y2VzICMg b2YgcmVnaXN0ZXJzIHVzZWQgaW4gUmVnRXhwVGVzdElubGluZSBpbXBsZW1lbnRhdGlvbiB0byBt YWtlIGl0IHdvcmsKKyAgICAgICAgd2VsbCBmb3IgeDY0IHVubGlua2VkIERGRyBzaW5jZSBpdCBj YW4gcmVkdWNlICMgb2YgcmVnaXN0ZXJzIHRvIHVzZSBvbmUgY2FsbGVlLXNhdmUgcmVnaXN0ZXIK KyAgICAgICAgZm9yIGNvbnN0YW50cyBidWZmZXIuCisKKyAgICAgICAgV2UgYWxzbyBhZGQgWWFy ckpJVFJlZ2lzdGVyczo6dmFsaWRhdGUgdG8gZW5zdXJlIHRoYXQgdXNlZCByZWdpc3RlcnMgbWVl dCB0aGUgaW52YXJpYW50cyBpbiBZYXJySklULgorCisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0 aXZlSklUNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxl UmVnRXhwVGVzdElubGluZSk6CisgICAgICAgICogeWFyci9ZYXJySklULmNwcDoKKyAgICAgICAg KEpTQzo6WWFycjo6aml0Q29tcGlsZUlubGluZWRUZXN0KToKKyAgICAgICAgKiB5YXJyL1lhcnJK SVRSZWdpc3RlcnMuaDoKKyAgICAgICAgKEpTQzo6WWFycjo6WWFyckpJVFJlZ2lzdGVyczo6dmFs aWRhdGUpOgorICAgICAgICAoSlNDOjpZYXJyOjpZYXJySklUUmVnaXN0ZXJzOjpZYXJySklUUmVn aXN0ZXJzKTogRGVsZXRlZC4KKwogMjAyMi0wMy0xNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWls bGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggY3Jhc2ggaW4gQmxlYWNoZXIgUmVwb3J0IGR1 ZSB0byBiYWQgSlNPYmplY3RSZWYgcGFzc2VkIHRvIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKaW5kZXggYTkxMmViNTk4Yjk4MjJh MzU5NmExYzE4Y2UxZTYyM2U4YWFhNjgxMS4uN2I5NTk3MDEzNjAxMzMzM2Y3YjM2YTYzODBjM2U4 OTAyYjU5NTkzOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVDY0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1 bGF0aXZlSklUNjQuY3BwCkBAIC0yNzAzLDI4ICsyNzAzLDI0IEBAIHZvaWQgU3BlY3VsYXRpdmVK SVQ6OmNvbXBpbGVSZWdFeHBUZXN0SW5saW5lKE5vZGUqIG5vZGUpCiAKICAgICBTcGVjdWxhdGVD ZWxsT3BlcmFuZCBnbG9iYWxPYmplY3QodGhpcywgbm9kZS0+Y2hpbGQxKCkpOwogICAgIFNwZWN1 bGF0ZUNlbGxPcGVyYW5kIGJhc2UodGhpcywgbm9kZS0+Y2hpbGQyKCkpOwotICAgIEdQUlJlZyBn bG9iYWxPYmplY3RHUFIgPSBnbG9iYWxPYmplY3QuZ3ByKCk7Ci0gICAgR1BSUmVnIGJhc2VHUFIg PSBiYXNlLmdwcigpOwotICAgIEdQUlJlZyBhcmd1bWVudEdQUjsKLSAgICBHUFJGbHVzaGVkQ2Fs bFJlc3VsdCByZXN1bHQodGhpcyk7Ci0gICAgR1BSUmVnIHJlc3VsdEdQUiA9IHJlc3VsdC5ncHIo KTsKKwogICAgIEdQUlRlbXBvcmFyeSBzdHJpbmdJbXBsKHRoaXMpOwogICAgIEdQUlRlbXBvcmFy eSBzdHJpbmdEYXRhKHRoaXMpOwogICAgIEdQUlRlbXBvcmFyeSBzdHJMZW5ndGgodGhpcyk7CiAg ICAgR1BSVGVtcG9yYXJ5IG91dHB1dCh0aGlzKTsKLSAgICBHUFJUZW1wb3JhcnkgcmVzdWx0Mih0 aGlzKTsKICAgICBHUFJUZW1wb3JhcnkgdGVtcDAodGhpcyk7CiAgICAgR1BSVGVtcG9yYXJ5IHRl bXAxKHRoaXMpOwotICAgIEdQUlRlbXBvcmFyeSB0ZW1wMjsKKyAgICBzdGQ6Om9wdGlvbmFsPEdQ UlRlbXBvcmFyeT4gdGVtcDI7CisKKyAgICBHUFJSZWcgZ2xvYmFsT2JqZWN0R1BSID0gZ2xvYmFs T2JqZWN0LmdwcigpOworICAgIEdQUlJlZyBiYXNlR1BSID0gYmFzZS5ncHIoKTsKICAgICBHUFJS ZWcgc3RyaW5nSW1wbEdQUiA9IHN0cmluZ0ltcGwuZ3ByKCk7CiAgICAgR1BSUmVnIHN0cmluZ0Rh dGFHUFIgPSBzdHJpbmdEYXRhLmdwcigpOwogICAgIEdQUlJlZyBvdXRwdXRHUFIgPSBvdXRwdXQu Z3ByKCk7CiAgICAgR1BSUmVnIHN0ckxlbmd0aEdQUiA9IHN0ckxlbmd0aC5ncHIoKTsKLSAgICBH UFJSZWcgcmVzdWx0MkdQUiA9IHJlc3VsdDIuZ3ByKCk7CiAgICAgR1BSUmVnIHRlbXAwR1BSID0g dGVtcDAuZ3ByKCk7CiAgICAgR1BSUmVnIHRlbXAxR1BSID0gdGVtcDEuZ3ByKCk7CiAgICAgR1BS UmVnIHRlbXAyR1BSID0gSW52YWxpZEdQUlJlZzsKLSAgICBHUFJSZWcgc3dhcFJlZyA9IEludmFs aWRHUFJSZWc7CiAKICAgICBhdXRvIGppdENvZGVCbG9jayA9IHJlZ0V4cC0+Z2V0UmVnRXhwSklU Q29kZUJsb2NrKCk7CiAgICAgQVNTRVJUKGppdENvZGVCbG9jayk7CkBAIC0yNzMyLDQ0ICsyNzI4 LDMxIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVSZWdFeHBUZXN0SW5saW5lKE5vZGUq IG5vZGUpCiAKICNpZiAhQ1BVKFg4Nl82NCkKICAgICBpZiAoaW5saW5lQ29kZVN0YXRzOEJpdC5u ZWVkc1RlbXAyKCkpIHsKLSAgICAgICAgR1BSVGVtcG9yYXJ5IHJlYWxUZW1wMih0aGlzKTsKLSAg ICAgICAgdGVtcDIuYWRvcHQocmVhbFRlbXAyKTsKLSAgICAgICAgdGVtcDJHUFIgPSB0ZW1wMi5n cHIoKTsKKyAgICAgICAgdGVtcDIuZW1wbGFjZSh0aGlzKTsKKyAgICAgICAgdGVtcDJHUFIgPSB0 ZW1wMi0+Z3ByKCk7CiAgICAgfQogI2VuZGlmCiAKICAgICBzcGVjdWxhdGVSZWdFeHBPYmplY3Qo bm9kZS0+Y2hpbGQyKCksIGJhc2VHUFIpOwogCi0gICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0 IGRvbmU7Ci0gICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0IG9wZXJhdGlvbkNhc2VzOwotCi0g ICAgYXV0byBzd2FwUmVnSWZOZWVkZWQgPSBbJl0gewotICAgICAgICBpZiAoZ2xvYmFsT2JqZWN0 R1BSID09IHJlc3VsdEdQUikgewotICAgICAgICAgICAgc3dhcFJlZyA9IGFsbG9jYXRlKCk7Ci0g ICAgICAgICAgICBtX2ppdC5tb3ZlKGdsb2JhbE9iamVjdEdQUiwgc3dhcFJlZyk7Ci0gICAgICAg ICAgICBnbG9iYWxPYmplY3RHUFIgPSBzd2FwUmVnOwotICAgICAgICB9IGVsc2UgaWYgKGJhc2VH UFIgPT0gcmVzdWx0R1BSKSB7Ci0gICAgICAgICAgICBzd2FwUmVnID0gYWxsb2NhdGUoKTsKLSAg ICAgICAgICAgIG1faml0Lm1vdmUoYmFzZUdQUiwgc3dhcFJlZyk7Ci0gICAgICAgICAgICBiYXNl R1BSID0gc3dhcFJlZzsKLSAgICAgICAgfSBlbHNlIGlmIChhcmd1bWVudEdQUiA9PSByZXN1bHRH UFIpIHsKLSAgICAgICAgICAgIHN3YXBSZWcgPSBhbGxvY2F0ZSgpOwotICAgICAgICAgICAgbV9q aXQubW92ZShhcmd1bWVudEdQUiwgc3dhcFJlZyk7Ci0gICAgICAgICAgICBhcmd1bWVudEdQUiA9 IHN3YXBSZWc7Ci0gICAgICAgIH0KLSAgICB9OworICAgIENDYWxsSGVscGVyczo6SnVtcExpc3Qg c2xvd0Nhc2VzOworCisgICAgYXV0byByZWdFeHBUZXN0SW5saW5lQ2FzZSA9IFsmXShHUFJSZWcg YXJndW1lbnRHUFIsIENDYWxsSGVscGVyczo6SnVtcExpc3QmIHNsb3dDYXNlcykgeworICAgICAg ICBtX2ppdC5sb2FkUHRyKE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKGFyZ3VtZW50R1BSLCBKU1N0 cmluZzo6b2Zmc2V0T2ZWYWx1ZSgpKSwgc3RyaW5nSW1wbEdQUik7CisgICAgICAgIC8vIElmIHRo ZSBzdHJpbmcgaXMgYSByb3BlIG9yIDE2IGJpdCwgd2UgY2FsbCB0aGUgb3BlcmF0aW9uLgorICAg ICAgICBzbG93Q2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaElmUm9wZVN0cmluZ0ltcGwoc3RyaW5n SW1wbEdQUikpOworICAgICAgICBzbG93Q2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaFRlc3QzMigK KyAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpaZXJvLAorICAgICAgICAgICAgTWFjcm9Bc3Nl bWJsZXI6OkFkZHJlc3Moc3RyaW5nSW1wbEdQUiwgU3RyaW5nSW1wbDo6ZmxhZ3NPZmZzZXQoKSks CisgICAgICAgICAgICBUcnVzdGVkSW1tMzIoU3RyaW5nSW1wbDo6ZmxhZ0lzOEJpdCgpKSkpOwog Ci0gICAgYXV0byByZWdFeHBUZXN0SW5saW5lQ2FzZSA9IFsmXSB7CiAgICAgICAgIG1faml0Lmxv YWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc3RyaW5nSW1wbEdQUiwgU3RyaW5nSW1wbDo6 ZGF0YU9mZnNldCgpKSwgc3RyaW5nRGF0YUdQUik7CiAgICAgICAgIG1faml0LmxvYWQzMihNYWNy b0Fzc2VtYmxlcjo6QWRkcmVzcyhzdHJpbmdJbXBsR1BSLCBTdHJpbmdJbXBsOjpsZW5ndGhNZW1v cnlPZmZzZXQoKSksIHN0ckxlbmd0aEdQUik7CiAKLSAgICAgICAgR1BSUmVnIGluZGV4R1BSID0g c3RyaW5nSW1wbEdQUjsKLQotICAgICAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW0zMigwKSwgaW5k ZXhHUFIpOwotCisgICAgICAgIC8vIENsb2JiZXJpbmcgaW5wdXQgcmVnaXN0ZXJzIGlzIE9LIHNp bmNlIHdlIGFscmVhZHkgY2FsbGVkIGZsdXNoUmVnaXN0ZXJzLgogICAgICAgICBZYXJyOjpZYXJy SklUUmVnaXN0ZXJzIHlhcnJSZWdpc3RlcnM7CiAgICAgICAgIHlhcnJSZWdpc3RlcnMuaW5wdXQg PSBzdHJpbmdEYXRhR1BSOwotICAgICAgICB5YXJyUmVnaXN0ZXJzLmluZGV4ID0gaW5kZXhHUFI7 CisgICAgICAgIHlhcnJSZWdpc3RlcnMuaW5kZXggPSBzdHJpbmdJbXBsR1BSOwogICAgICAgICB5 YXJyUmVnaXN0ZXJzLmxlbmd0aCA9IHN0ckxlbmd0aEdQUjsKICAgICAgICAgeWFyclJlZ2lzdGVy cy5vdXRwdXQgPSBvdXRwdXRHUFI7CiAgICAgICAgIHlhcnJSZWdpc3RlcnMucmVnVDAgPSB0ZW1w MEdQUjsKQEAgLTI3ODAsMjAgKzI3NjMsMjAgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGls ZVJlZ0V4cFRlc3RJbmxpbmUoTm9kZSogbm9kZSkKICAgICAgICAgaWYgKGlubGluZUNvZGVTdGF0 czhCaXQubmVlZHNUZW1wMigpKQogICAgICAgICAgICAgeWFyclJlZ2lzdGVycy5yZWdUMiA9IHRl bXAyR1BSOwogCi0gICAgICAgIHlhcnJSZWdpc3RlcnMucmV0dXJuUmVnaXN0ZXIgPSByZXN1bHRH UFI7Ci0gICAgICAgIHlhcnJSZWdpc3RlcnMucmV0dXJuUmVnaXN0ZXIyID0gcmVzdWx0MkdQUjsK KyAgICAgICAgeWFyclJlZ2lzdGVycy5yZXR1cm5SZWdpc3RlciA9IHRlbXAwR1BSOworICAgICAg ICB5YXJyUmVnaXN0ZXJzLnJldHVyblJlZ2lzdGVyMiA9IHN0cmluZ0RhdGFHUFI7CiAKICAgICAg ICAgYXV0byBjb21tb25EYXRhID0gbV9qaXQuaml0Q29kZSgpLT5kZmdDb21tb24oKTsKKyAgICAg ICAgbV9qaXQubW92ZShUcnVzdGVkSW1tMzIoMCksIHlhcnJSZWdpc3RlcnMuaW5kZXgpOwogICAg ICAgICBZYXJyOjpqaXRDb21waWxlSW5saW5lZFRlc3QoJm1fZ3JhcGgubV9zdGFja0NoZWNrZXIs IHJlZ0V4cC0+cGF0dGVybigpLCByZWdFeHAtPmZsYWdzKCksIFlhcnI6OkNoYXJTaXplOjpDaGFy OCwgJnZtKCksIGNvbW1vbkRhdGEtPm1fYm95ZXJNb29yZURhdGEsIG1faml0LCB5YXJyUmVnaXN0 ZXJzKTsKIAotICAgICAgICBhdXRvIGZhaWxlZE1hdGNoID0gbV9qaXQuYnJhbmNoMzIoTWFjcm9B c3NlbWJsZXI6Okxlc3NUaGFuLCByZXN1bHRHUFIsIFRydXN0ZWRJbW0zMigwKSk7CisgICAgICAg IGF1dG8gZmFpbGVkTWF0Y2ggPSBtX2ppdC5icmFuY2gzMihNYWNyb0Fzc2VtYmxlcjo6TGVzc1Ro YW4sIHlhcnJSZWdpc3RlcnMucmV0dXJuUmVnaXN0ZXIsIFRydXN0ZWRJbW0zMigwKSk7CiAKICAg ICAgICAgLy8gIFNhdmVkIGNhY2hlZCByZXN1bHQKICNpZiBDUFUoWDg2XzY0KQogICAgICAgICBp ZiAoaW5saW5lQ29kZVN0YXRzOEJpdC5uZWVkc1RlbXAyKCkpIHsKICAgICAgICAgICAgIC8vIFNp bmNlIHdlIHJldXNlZCBnbG9iYWxPYmplY3RHUFIgZm9yIHRlbXAyLCBsZXQncyByZXN0b3JlIHRo ZSBnbG9iYWwgb2JqZWN0LgotICAgICAgICAgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVj dENvbnN0ID0ganNDYXN0PEpTR2xvYmFsT2JqZWN0Kj4obm9kZS0+Y2VsbE9wZXJhbmQoKS0+dmFs dWUoKSk7Ci0gICAgICAgICAgICBtX2ppdC5tb3ZlKENDYWxsSGVscGVyczo6VHJ1c3RlZEltbVB0 cihnbG9iYWxPYmplY3RDb25zdCksIGdsb2JhbE9iamVjdEdQUik7CisgICAgICAgICAgICBtX2pp dC5tb3ZlKFRydXN0ZWRJbW1QdHI6OndlYWtQb2ludGVyKGpzQ2FzdDxKU0dsb2JhbE9iamVjdCo+ KG5vZGUtPmNlbGxPcGVyYW5kKCktPnZhbHVlKCkpKSwgZ2xvYmFsT2JqZWN0R1BSKTsKICAgICAg ICAgfQogI2VuZGlmCiAKQEAgLTI4MDEsODAgKzI3ODQsNTYgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZVJlZ0V4cFRlc3RJbmxpbmUoTm9kZSogbm9kZSkKIAogICAgICAgICBtX2ppdC5z dG9yZVB0cihUcnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBoLCByZWdFeHApLCBKSVRD b21waWxlcjo6QWRkcmVzcyhnbG9iYWxPYmplY3RHUFIsIG9mZnNldCArIFJlZ0V4cENhY2hlZFJl c3VsdDo6b2Zmc2V0T2ZMYXN0UmVnRXhwKCkpKTsKICAgICAgICAgbV9qaXQuc3RvcmVQdHIoYXJn dW1lbnRHUFIsIEpJVENvbXBpbGVyOjpBZGRyZXNzKGdsb2JhbE9iamVjdEdQUiwgb2Zmc2V0ICsg UmVnRXhwQ2FjaGVkUmVzdWx0OjpvZmZzZXRPZkxhc3RJbnB1dCgpKSk7Ci0gICAgICAgIG1faml0 LnN0b3JlMzIocmVzdWx0R1BSLCBKSVRDb21waWxlcjo6QWRkcmVzcyhnbG9iYWxPYmplY3RHUFIs IG9mZnNldCArIFJlZ0V4cENhY2hlZFJlc3VsdDo6b2Zmc2V0T2ZSZXN1bHQoKSArIE9CSkVDVF9P RkZTRVRPRihNYXRjaFJlc3VsdCwgc3RhcnQpKSk7Ci0gICAgICAgIG1faml0LnN0b3JlMzIocmVz dWx0MkdQUiwgSklUQ29tcGlsZXI6OkFkZHJlc3MoZ2xvYmFsT2JqZWN0R1BSLCBvZmZzZXQgKyBS ZWdFeHBDYWNoZWRSZXN1bHQ6Om9mZnNldE9mUmVzdWx0KCkgKyBPQkpFQ1RfT0ZGU0VUT0YoTWF0 Y2hSZXN1bHQsIGVuZCkpKTsKKyAgICAgICAgbV9qaXQuc3RvcmUzMih5YXJyUmVnaXN0ZXJzLnJl dHVyblJlZ2lzdGVyLCBKSVRDb21waWxlcjo6QWRkcmVzcyhnbG9iYWxPYmplY3RHUFIsIG9mZnNl dCArIFJlZ0V4cENhY2hlZFJlc3VsdDo6b2Zmc2V0T2ZSZXN1bHQoKSArIE9CSkVDVF9PRkZTRVRP RihNYXRjaFJlc3VsdCwgc3RhcnQpKSk7CisgICAgICAgIG1faml0LnN0b3JlMzIoeWFyclJlZ2lz dGVycy5yZXR1cm5SZWdpc3RlcjIsIEpJVENvbXBpbGVyOjpBZGRyZXNzKGdsb2JhbE9iamVjdEdQ Uiwgb2Zmc2V0ICsgUmVnRXhwQ2FjaGVkUmVzdWx0OjpvZmZzZXRPZlJlc3VsdCgpICsgT0JKRUNU X09GRlNFVE9GKE1hdGNoUmVzdWx0LCBlbmQpKSk7CiAgICAgICAgIG1faml0LnN0b3JlOChUcnVz dGVkSW1tMzIoMCksIEpJVENvbXBpbGVyOjpBZGRyZXNzKGdsb2JhbE9iamVjdEdQUiwgb2Zmc2V0 ICsgUmVnRXhwQ2FjaGVkUmVzdWx0OjpvZmZzZXRPZlJlaWZpZWQoKSkpOwogCi0gICAgICAgIGlm IChzd2FwUmVnICE9IEludmFsaWRHUFJSZWcpCi0gICAgICAgICAgICB1bmxvY2soc3dhcFJlZyk7 CisgICAgICAgIENDYWxsSGVscGVyczo6SnVtcExpc3QgZG9uZUNhc2VzOwogCi0gICAgICAgIG1f aml0Lm1vdmUoVHJ1c3RlZEltbTMyKDEpLCByZXN1bHRHUFIpOwotICAgICAgICBkb25lLmFwcGVu ZChtX2ppdC5qdW1wKCkpOworICAgICAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW0zMigxKSwgdGVt cDBHUFIpOworICAgICAgICBkb25lQ2FzZXMuYXBwZW5kKG1faml0Lmp1bXAoKSk7CiAKICAgICAg ICAgZmFpbGVkTWF0Y2gubGluaygmbV9qaXQpOwotICAgICAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJ bW0zMigwKSwgcmVzdWx0R1BSKTsKLSAgICAgICAgZG9uZS5hcHBlbmQobV9qaXQuanVtcCgpKTsK KyAgICAgICAgbV9qaXQubW92ZShUcnVzdGVkSW1tMzIoMCksIHRlbXAwR1BSKTsKKyAgICAgICAg ZG9uZUNhc2VzLmFwcGVuZChtX2ppdC5qdW1wKCkpOworCisgICAgICAgIHJldHVybiBkb25lQ2Fz ZXM7CiAgICAgfTsKIAogICAgIGlmIChub2RlLT5jaGlsZDMoKS51c2VLaW5kKCkgPT0gU3RyaW5n VXNlKSB7CiAgICAgICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGFyZ3VtZW50KHRoaXMsIG5vZGUt PmNoaWxkMygpKTsKLSAgICAgICAgYXJndW1lbnRHUFIgPSBhcmd1bWVudC5ncHIoKTsKKyAgICAg ICAgR1BSUmVnIGFyZ3VtZW50R1BSID0gYXJndW1lbnQuZ3ByKCk7CiAgICAgICAgIHNwZWN1bGF0 ZVN0cmluZyhub2RlLT5jaGlsZDMoKSwgYXJndW1lbnRHUFIpOwogCiAgICAgICAgIGZsdXNoUmVn aXN0ZXJzKCk7CiAKLSAgICAgICAgc3dhcFJlZ0lmTmVlZGVkKCk7Ci0KLSAgICAgICAgbV9qaXQu bG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhhcmd1bWVudEdQUiwgSlNTdHJpbmc6Om9m ZnNldE9mVmFsdWUoKSksIHN0cmluZ0ltcGxHUFIpOwotICAgICAgICAvLyBJZiB0aGUgc3RyaW5n IGlzIGEgcm9wZSBvciAxNiBiaXQsIHdlIGNhbGwgdGhlIG9wZXJhdGlvbi4KLSAgICAgICAgb3Bl cmF0aW9uQ2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaElmUm9wZVN0cmluZ0ltcGwoc3RyaW5nSW1w bEdQUikpOwotICAgICAgICBvcGVyYXRpb25DYXNlcy5hcHBlbmQobV9qaXQuYnJhbmNoVGVzdDMy KAotICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Olplcm8sCi0gICAgICAgICAgICBNYWNyb0Fz c2VtYmxlcjo6QWRkcmVzcyhzdHJpbmdJbXBsR1BSLCBTdHJpbmdJbXBsOjpmbGFnc09mZnNldCgp KSwKLSAgICAgICAgICAgIFRydXN0ZWRJbW0zMihTdHJpbmdJbXBsOjpmbGFnSXM4Qml0KCkpKSk7 Ci0KLSAgICAgICAgcmVnRXhwVGVzdElubGluZUNhc2UoKTsKLQotICAgICAgICBvcGVyYXRpb25D YXNlcy5saW5rKCZtX2ppdCk7Ci0KLSAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25SZWdF eHBUZXN0U3RyaW5nLCByZXN1bHRHUFIsIGdsb2JhbE9iamVjdEdQUiwgYmFzZUdQUiwgYXJndW1l bnRHUFIpOworICAgICAgICBhdXRvIGRvbmVDYXNlcyA9IHJlZ0V4cFRlc3RJbmxpbmVDYXNlKGFy Z3VtZW50R1BSLCBzbG93Q2FzZXMpOwogCisgICAgICAgIHNsb3dDYXNlcy5saW5rKCZtX2ppdCk7 CisgICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUmVnRXhwVGVzdFN0cmluZywgdGVtcDBH UFIsIGdsb2JhbE9iamVjdEdQUiwgYmFzZUdQUiwgYXJndW1lbnRHUFIpOwogICAgICAgICBtX2pp dC5leGNlcHRpb25DaGVjaygpOwogCi0gICAgICAgIGRvbmUubGluaygmbV9qaXQpOwotICAgICAg ICB1bmJsZXNzZWRCb29sZWFuUmVzdWx0KHJlc3VsdEdQUiwgbm9kZSk7Ci0KKyAgICAgICAgZG9u ZUNhc2VzLmxpbmsoJm1faml0KTsKKyAgICAgICAgdW5ibGVzc2VkQm9vbGVhblJlc3VsdCh0ZW1w MEdQUiwgbm9kZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBKU1ZhbHVlT3BlcmFu ZCBhcmd1bWVudCh0aGlzLCBub2RlLT5jaGlsZDMoKSk7Ci0gICAgYXJndW1lbnRHUFIgPSBhcmd1 bWVudC5ncHIoKTsKKyAgICBHUFJSZWcgYXJndW1lbnRHUFIgPSBhcmd1bWVudC5ncHIoKTsKIAog ICAgIGZsdXNoUmVnaXN0ZXJzKCk7CiAKLSAgICBzd2FwUmVnSWZOZWVkZWQoKTsKLQotICAgIG9w ZXJhdGlvbkNhc2VzLmFwcGVuZChtX2ppdC5icmFuY2hJZk5vdENlbGwoYXJndW1lbnRHUFIpKTsK LSAgICBvcGVyYXRpb25DYXNlcy5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RTdHJpbmcoYXJndW1l bnRHUFIpKTsKLQotICAgIG1faml0LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoYXJn dW1lbnRHUFIsIEpTU3RyaW5nOjpvZmZzZXRPZlZhbHVlKCkpLCBzdHJpbmdJbXBsR1BSKTsKLSAg ICAvLyBJZiB0aGUgc3RyaW5nIGlzIGEgcm9wZSBvciAxNiBiaXQsIHdlIGNhbGwgdGhlIG9wZXJh dGlvbi4KLSAgICBvcGVyYXRpb25DYXNlcy5hcHBlbmQobV9qaXQuYnJhbmNoSWZSb3BlU3RyaW5n SW1wbChzdHJpbmdJbXBsR1BSKSk7Ci0gICAgb3BlcmF0aW9uQ2FzZXMuYXBwZW5kKG1faml0LmJy YW5jaFRlc3QzMigKLSAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Olplcm8sCi0gICAgICAgIE1hY3Jv QXNzZW1ibGVyOjpBZGRyZXNzKHN0cmluZ0ltcGxHUFIsIFN0cmluZ0ltcGw6OmZsYWdzT2Zmc2V0 KCkpLAotICAgICAgICBUcnVzdGVkSW1tMzIoU3RyaW5nSW1wbDo6ZmxhZ0lzOEJpdCgpKSkpOwor ICAgIHNsb3dDYXNlcy5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RDZWxsKGFyZ3VtZW50R1BSKSk7 CisgICAgc2xvd0Nhc2VzLmFwcGVuZChtX2ppdC5icmFuY2hJZk5vdFN0cmluZyhhcmd1bWVudEdQ UikpOwogCi0gICAgcmVnRXhwVGVzdElubGluZUNhc2UoKTsKKyAgICBhdXRvIGRvbmVDYXNlcyA9 IHJlZ0V4cFRlc3RJbmxpbmVDYXNlKGFyZ3VtZW50R1BSLCBzbG93Q2FzZXMpOwogCi0gICAgb3Bl cmF0aW9uQ2FzZXMubGluaygmbV9qaXQpOwotCi0gICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25S ZWdFeHBUZXN0LCByZXN1bHRHUFIsIGdsb2JhbE9iamVjdEdQUiwgYmFzZUdQUiwgYXJndW1lbnRH UFIpOwotCi0gICAgZG9uZS5saW5rKCZtX2ppdCk7CisgICAgc2xvd0Nhc2VzLmxpbmsoJm1faml0 KTsKKyAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblJlZ0V4cFRlc3QsIHRlbXAwR1BSLCBnbG9i YWxPYmplY3RHUFIsIGJhc2VHUFIsIGFyZ3VtZW50R1BSKTsKICAgICBtX2ppdC5leGNlcHRpb25D aGVjaygpOwogCi0gICAgdW5ibGVzc2VkQm9vbGVhblJlc3VsdChyZXN1bHRHUFIsIG5vZGUpOwor ICAgIGRvbmVDYXNlcy5saW5rKCZtX2ppdCk7CisgICAgdW5ibGVzc2VkQm9vbGVhblJlc3VsdCh0 ZW1wMEdQUiwgbm9kZSk7CiB9CiAjZWxzZQogdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVJl Z0V4cFRlc3RJbmxpbmUoTm9kZSogbm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS95YXJyL1lhcnJKSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJ VC5jcHAKaW5kZXggOGM4Y2Q1NTY0YzliODBhOTlhMzE1ZWM1YzU0MDMzNTkwNjc1ZjMyYy4uNmUx MTA2YmNhOGNmYTMzOTY5NmYyMmNkMDQyMDFkZDk3NmFiMmFjMSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3lhcnIvWWFyckpJVC5jcHAKQEAgLTQwMzMsNiArNDAzMyw3IEBAIGNsYXNzIFlhcnJHZW5l cmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8gewogI2lmIENQVShYODZfNjQpCiAjaWYg T1MoV0lORE9XUykKICAgICAgICAgLy8gU3RvcmUgdGhlIHJldHVybiB2YWx1ZSBpbiB0aGUgYWxs b2NhdGVkIHNwYWNlIHBvaW50ZWQgYnkgcmN4LgorICAgICAgICBBU1NFUlQobm9PdmVybGFwKFg4 NlJlZ2lzdGVyczo6ZWN4LCBtX3JlZ3MucmV0dXJuUmVnaXN0ZXIsIG1fcmVncy5yZXR1cm5SZWdp c3RlcjIpKTsKICAgICAgICAgbV9qaXQucG9wKFg4NlJlZ2lzdGVyczo6ZWN4KTsKICAgICAgICAg bV9qaXQuc3RvcmU2NChtX3JlZ3MucmV0dXJuUmVnaXN0ZXIsIE1hY3JvQXNzZW1ibGVyOjpBZGRy ZXNzKFg4NlJlZ2lzdGVyczo6ZWN4KSk7CiAgICAgICAgIG1faml0LnN0b3JlNjQobV9yZWdzLnJl dHVyblJlZ2lzdGVyMiwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoWDg2UmVnaXN0ZXJzOjplY3gs IHNpemVvZih2b2lkKikpKTsKQEAgLTQ3NTAsNiArNDc1MSw4IEBAIHZvaWQgaml0Q29tcGlsZUlu bGluZWRUZXN0KFN0YWNrQ2hlY2sqIG1fY29tcGlsYXRpb25UaHJlYWRTdGFja0NoZWNrZXIsIGNv bnN0IFN0CiAgICAgWWFycjo6RXJyb3JDb2RlIGVycm9yQ29kZTsKICAgICBZYXJyOjpZYXJyUGF0 dGVybiBwYXR0ZXJuKHBhdHRlcm5TdHJpbmcsIGZsYWdzLCBlcnJvckNvZGUpOwogCisgICAgaml0 UmVnaXN0ZXJzLnZhbGlkYXRlKCk7CisKICAgICBZYXJyR2VuZXJhdG9yPFlhcnJKSVRSZWdpc3Rl cnM+IHlhcnJHZW5lcmF0b3Ioaml0LCB2bSwgJmJveWVyTW9vcmVEYXRhLCBqaXRSZWdpc3RlcnMs IHBhdHRlcm4sIHBhdHRlcm5TdHJpbmcsIGNoYXJTaXplLCBKSVRDb21waWxlTW9kZTo6SW5saW5l VGVzdCk7CiAgICAgeWFyckdlbmVyYXRvci5zZXRTdGFja0NoZWNrZXIobV9jb21waWxhdGlvblRo cmVhZFN0YWNrQ2hlY2tlcik7CiAgICAgeWFyckdlbmVyYXRvci5jb21waWxlSW5saW5lKGJveWVy TW9vcmVEYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJK SVRSZWdpc3RlcnMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVRSZWdpc3Rl cnMuaAppbmRleCBlOGZhZTE1OWEyYzg3MjYxZDA0YmFiNjQyZDcyN2VjY2I1NzM5Yzk4Li4xZjFm ODg1YTBmNjVmM2Y3ZTcwNjU1YmNlZDZkZGI4ZGQzYjg3NzMwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklUUmVnaXN0ZXJzLmgKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3lhcnIvWWFyckpJVFJlZ2lzdGVycy5oCkBAIC0xNzUsOCArMTc1LDMwIEBAIHN0 cnVjdCBZYXJySklURGVmYXVsdFJlZ2lzdGVycyB7CiAjaWYgRU5BQkxFKFlBUlJfSklUX1JFR0VY UF9URVNUX0lOTElORSkKIGNsYXNzIFlhcnJKSVRSZWdpc3RlcnMgewogcHVibGljOgotICAgIFlh cnJKSVRSZWdpc3RlcnMoKQorICAgIFlhcnJKSVRSZWdpc3RlcnMoKSA9IGRlZmF1bHQ7CisKKyAg ICB2b2lkIHZhbGlkYXRlKCkKICAgICB7CisjaWYgQVNTRVJUX0VOQUJMRUQKKyAgICAgICAgQVNT RVJUKGlucHV0ICE9IEludmFsaWRHUFJSZWcpOworICAgICAgICBBU1NFUlQoaW5kZXggIT0gSW52 YWxpZEdQUlJlZyk7CisgICAgICAgIEFTU0VSVChsZW5ndGggIT0gSW52YWxpZEdQUlJlZyk7Cisg ICAgICAgIEFTU0VSVChvdXRwdXQgIT0gSW52YWxpZEdQUlJlZyk7CisKKyAgICAgICAgQVNTRVJU KHJldHVyblJlZ2lzdGVyICE9IEludmFsaWRHUFJSZWcpOworICAgICAgICBBU1NFUlQocmV0dXJu UmVnaXN0ZXIyICE9IEludmFsaWRHUFJSZWcpOworCisgICAgICAgIEFTU0VSVChyZWdUMCAhPSBJ bnZhbGlkR1BSUmVnKTsKKyAgICAgICAgQVNTRVJUKHJlZ1QxICE9IEludmFsaWRHUFJSZWcpOwor CisgICAgICAgIEFTU0VSVChub092ZXJsYXAoaW5wdXQsIGluZGV4LCBsZW5ndGgsIG91dHB1dCwg cmVnVDAsIHJlZ1QxKSk7CisgICAgICAgIEFTU0VSVChub092ZXJsYXAocmV0dXJuUmVnaXN0ZXIs IHJldHVyblJlZ2lzdGVyMikpOworICAgICAgICBBU1NFUlQobm9PdmVybGFwKGluZGV4LCByZXR1 cm5SZWdpc3RlcikpOworCisjaWYgQ1BVKFg4Nl82NCkgJiYgT1MoV0lORE9XUykKKyAgICAgICAg QVNTRVJUKG5vT3ZlcmxhcChYODZSZWdpc3RlcnM6OmVjeCwgcmV0dXJuUmVnaXN0ZXIsIG1fcmVn cy5yZXR1cm5SZWdpc3RlcjIpKTsKKyNlbmRpZgorI2VuZGlmCiAgICAgfQogCiAgICAgLy8gQXJn dW1lbnQgcmVnaXN0ZXJzCkBAIC0xODQsNiArMjA2LDcgQEAgY2xhc3MgWWFyckpJVFJlZ2lzdGVy cyB7CiAgICAgR1BSUmVnIGluZGV4IHsgSW52YWxpZEdQUlJlZyB9OwogICAgIEdQUlJlZyBsZW5n dGggeyBJbnZhbGlkR1BSUmVnIH07CiAgICAgR1BSUmVnIG91dHB1dCB7IEludmFsaWRHUFJSZWcg fTsKKwogICAgIEdQUlJlZyBtYXRjaGluZ0NvbnRleHQgeyBJbnZhbGlkR1BSUmVnIH07CiAgICAg R1BSUmVnIGZyZWVsaXN0UmVnaXN0ZXIgeyBJbnZhbGlkR1BSUmVnIH07CiAgICAgR1BSUmVnIGZy ZWVsaXN0U2l6ZVJlZ2lzdGVyIHsgSW52YWxpZEdQUlJlZyB9Owo= 455132 2022-03-18 14:14:08 -0700 2022-03-18 15:10:36 -0700 Patch bug-238092-20220318141408.patch text/plain 14126 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh NzQzMWJiZDRhZmUxYTk5ZTUwNjdlMjgyZmFjYTMyZGRmNzMxZmQ0Li5iYTBkZmYwODU0MWRlYzhj MjU0ODZlNjkyYmQ4MzQwMjg5OWYzNDM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMi0wMy0xOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFJlZHVjZSAjIG9mIHJlZ2lzdGVycyB1c2VkIGluIFJlZ0V4cFRl c3RJbmxpbmUgdG8gYWxsb3cgdXNpbmcgdW5saW5rZWQgREZHIGluIHg2NAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MDkyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZWR1Y2VzICMg b2YgcmVnaXN0ZXJzIHVzZWQgaW4gUmVnRXhwVGVzdElubGluZSBpbXBsZW1lbnRhdGlvbiB0byBt YWtlIGl0IHdvcmsKKyAgICAgICAgd2VsbCBmb3IgeDY0IHVubGlua2VkIERGRyBzaW5jZSBpdCBj YW4gcmVkdWNlICMgb2YgcmVnaXN0ZXJzIHRvIHVzZSBvbmUgY2FsbGVlLXNhdmUgcmVnaXN0ZXIK KyAgICAgICAgZm9yIGNvbnN0YW50cyBidWZmZXIuCisKKyAgICAgICAgV2UgYWxzbyBhZGQgWWFy ckpJVFJlZ2lzdGVyczo6dmFsaWRhdGUgdG8gZW5zdXJlIHRoYXQgdXNlZCByZWdpc3RlcnMgbWVl dCB0aGUgaW52YXJpYW50cyBpbiBZYXJySklULgorCisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0 aXZlSklUNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxl UmVnRXhwVGVzdElubGluZSk6CisgICAgICAgICogeWFyci9ZYXJySklULmNwcDoKKyAgICAgICAg KEpTQzo6WWFycjo6aml0Q29tcGlsZUlubGluZWRUZXN0KToKKyAgICAgICAgKiB5YXJyL1lhcnJK SVRSZWdpc3RlcnMuaDoKKyAgICAgICAgKEpTQzo6WWFycjo6WWFyckpJVFJlZ2lzdGVyczo6dmFs aWRhdGUpOgorICAgICAgICAoSlNDOjpZYXJyOjpZYXJySklUUmVnaXN0ZXJzOjpZYXJySklUUmVn aXN0ZXJzKTogRGVsZXRlZC4KKwogMjAyMi0wMy0xNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWls bGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggY3Jhc2ggaW4gQmxlYWNoZXIgUmVwb3J0IGR1 ZSB0byBiYWQgSlNPYmplY3RSZWYgcGFzc2VkIHRvIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKaW5kZXggYTkxMmViNTk4Yjk4MjJh MzU5NmExYzE4Y2UxZTYyM2U4YWFhNjgxMS4uYjIyNTFkMTE2YTkyYWVlN2QwOTYyYmE2ZmI5ZDQ5 OTBjNGQ3OWZiNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVDY0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1 bGF0aXZlSklUNjQuY3BwCkBAIC0yNzAzLDI4ICsyNzAzLDI0IEBAIHZvaWQgU3BlY3VsYXRpdmVK SVQ6OmNvbXBpbGVSZWdFeHBUZXN0SW5saW5lKE5vZGUqIG5vZGUpCiAKICAgICBTcGVjdWxhdGVD ZWxsT3BlcmFuZCBnbG9iYWxPYmplY3QodGhpcywgbm9kZS0+Y2hpbGQxKCkpOwogICAgIFNwZWN1 bGF0ZUNlbGxPcGVyYW5kIGJhc2UodGhpcywgbm9kZS0+Y2hpbGQyKCkpOwotICAgIEdQUlJlZyBn bG9iYWxPYmplY3RHUFIgPSBnbG9iYWxPYmplY3QuZ3ByKCk7Ci0gICAgR1BSUmVnIGJhc2VHUFIg PSBiYXNlLmdwcigpOwotICAgIEdQUlJlZyBhcmd1bWVudEdQUjsKLSAgICBHUFJGbHVzaGVkQ2Fs bFJlc3VsdCByZXN1bHQodGhpcyk7Ci0gICAgR1BSUmVnIHJlc3VsdEdQUiA9IHJlc3VsdC5ncHIo KTsKKwogICAgIEdQUlRlbXBvcmFyeSBzdHJpbmdJbXBsKHRoaXMpOwogICAgIEdQUlRlbXBvcmFy eSBzdHJpbmdEYXRhKHRoaXMpOwogICAgIEdQUlRlbXBvcmFyeSBzdHJMZW5ndGgodGhpcyk7CiAg ICAgR1BSVGVtcG9yYXJ5IG91dHB1dCh0aGlzKTsKLSAgICBHUFJUZW1wb3JhcnkgcmVzdWx0Mih0 aGlzKTsKICAgICBHUFJUZW1wb3JhcnkgdGVtcDAodGhpcyk7CiAgICAgR1BSVGVtcG9yYXJ5IHRl bXAxKHRoaXMpOwotICAgIEdQUlRlbXBvcmFyeSB0ZW1wMjsKKyAgICBzdGQ6Om9wdGlvbmFsPEdQ UlRlbXBvcmFyeT4gdGVtcDI7CisKKyAgICBHUFJSZWcgZ2xvYmFsT2JqZWN0R1BSID0gZ2xvYmFs T2JqZWN0LmdwcigpOworICAgIEdQUlJlZyBiYXNlR1BSID0gYmFzZS5ncHIoKTsKICAgICBHUFJS ZWcgc3RyaW5nSW1wbEdQUiA9IHN0cmluZ0ltcGwuZ3ByKCk7CiAgICAgR1BSUmVnIHN0cmluZ0Rh dGFHUFIgPSBzdHJpbmdEYXRhLmdwcigpOwogICAgIEdQUlJlZyBvdXRwdXRHUFIgPSBvdXRwdXQu Z3ByKCk7CiAgICAgR1BSUmVnIHN0ckxlbmd0aEdQUiA9IHN0ckxlbmd0aC5ncHIoKTsKLSAgICBH UFJSZWcgcmVzdWx0MkdQUiA9IHJlc3VsdDIuZ3ByKCk7CiAgICAgR1BSUmVnIHRlbXAwR1BSID0g dGVtcDAuZ3ByKCk7CiAgICAgR1BSUmVnIHRlbXAxR1BSID0gdGVtcDEuZ3ByKCk7CiAgICAgR1BS UmVnIHRlbXAyR1BSID0gSW52YWxpZEdQUlJlZzsKLSAgICBHUFJSZWcgc3dhcFJlZyA9IEludmFs aWRHUFJSZWc7CiAKICAgICBhdXRvIGppdENvZGVCbG9jayA9IHJlZ0V4cC0+Z2V0UmVnRXhwSklU Q29kZUJsb2NrKCk7CiAgICAgQVNTRVJUKGppdENvZGVCbG9jayk7CkBAIC0yNzMyLDQ0ICsyNzI4 LDMxIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVSZWdFeHBUZXN0SW5saW5lKE5vZGUq IG5vZGUpCiAKICNpZiAhQ1BVKFg4Nl82NCkKICAgICBpZiAoaW5saW5lQ29kZVN0YXRzOEJpdC5u ZWVkc1RlbXAyKCkpIHsKLSAgICAgICAgR1BSVGVtcG9yYXJ5IHJlYWxUZW1wMih0aGlzKTsKLSAg ICAgICAgdGVtcDIuYWRvcHQocmVhbFRlbXAyKTsKLSAgICAgICAgdGVtcDJHUFIgPSB0ZW1wMi5n cHIoKTsKKyAgICAgICAgdGVtcDIuZW1wbGFjZSh0aGlzKTsKKyAgICAgICAgdGVtcDJHUFIgPSB0 ZW1wMi0+Z3ByKCk7CiAgICAgfQogI2VuZGlmCiAKICAgICBzcGVjdWxhdGVSZWdFeHBPYmplY3Qo bm9kZS0+Y2hpbGQyKCksIGJhc2VHUFIpOwogCi0gICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0 IGRvbmU7Ci0gICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0IG9wZXJhdGlvbkNhc2VzOwotCi0g ICAgYXV0byBzd2FwUmVnSWZOZWVkZWQgPSBbJl0gewotICAgICAgICBpZiAoZ2xvYmFsT2JqZWN0 R1BSID09IHJlc3VsdEdQUikgewotICAgICAgICAgICAgc3dhcFJlZyA9IGFsbG9jYXRlKCk7Ci0g ICAgICAgICAgICBtX2ppdC5tb3ZlKGdsb2JhbE9iamVjdEdQUiwgc3dhcFJlZyk7Ci0gICAgICAg ICAgICBnbG9iYWxPYmplY3RHUFIgPSBzd2FwUmVnOwotICAgICAgICB9IGVsc2UgaWYgKGJhc2VH UFIgPT0gcmVzdWx0R1BSKSB7Ci0gICAgICAgICAgICBzd2FwUmVnID0gYWxsb2NhdGUoKTsKLSAg ICAgICAgICAgIG1faml0Lm1vdmUoYmFzZUdQUiwgc3dhcFJlZyk7Ci0gICAgICAgICAgICBiYXNl R1BSID0gc3dhcFJlZzsKLSAgICAgICAgfSBlbHNlIGlmIChhcmd1bWVudEdQUiA9PSByZXN1bHRH UFIpIHsKLSAgICAgICAgICAgIHN3YXBSZWcgPSBhbGxvY2F0ZSgpOwotICAgICAgICAgICAgbV9q aXQubW92ZShhcmd1bWVudEdQUiwgc3dhcFJlZyk7Ci0gICAgICAgICAgICBhcmd1bWVudEdQUiA9 IHN3YXBSZWc7Ci0gICAgICAgIH0KLSAgICB9OworICAgIENDYWxsSGVscGVyczo6SnVtcExpc3Qg c2xvd0Nhc2VzOworCisgICAgYXV0byByZWdFeHBUZXN0SW5saW5lQ2FzZSA9IFsmXShHUFJSZWcg YXJndW1lbnRHUFIsIENDYWxsSGVscGVyczo6SnVtcExpc3QmIHNsb3dDYXNlcykgeworICAgICAg ICBtX2ppdC5sb2FkUHRyKE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKGFyZ3VtZW50R1BSLCBKU1N0 cmluZzo6b2Zmc2V0T2ZWYWx1ZSgpKSwgc3RyaW5nSW1wbEdQUik7CisgICAgICAgIC8vIElmIHRo ZSBzdHJpbmcgaXMgYSByb3BlIG9yIDE2IGJpdCwgd2UgY2FsbCB0aGUgb3BlcmF0aW9uLgorICAg ICAgICBzbG93Q2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaElmUm9wZVN0cmluZ0ltcGwoc3RyaW5n SW1wbEdQUikpOworICAgICAgICBzbG93Q2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaFRlc3QzMigK KyAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpaZXJvLAorICAgICAgICAgICAgTWFjcm9Bc3Nl bWJsZXI6OkFkZHJlc3Moc3RyaW5nSW1wbEdQUiwgU3RyaW5nSW1wbDo6ZmxhZ3NPZmZzZXQoKSks CisgICAgICAgICAgICBUcnVzdGVkSW1tMzIoU3RyaW5nSW1wbDo6ZmxhZ0lzOEJpdCgpKSkpOwog Ci0gICAgYXV0byByZWdFeHBUZXN0SW5saW5lQ2FzZSA9IFsmXSB7CiAgICAgICAgIG1faml0Lmxv YWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc3RyaW5nSW1wbEdQUiwgU3RyaW5nSW1wbDo6 ZGF0YU9mZnNldCgpKSwgc3RyaW5nRGF0YUdQUik7CiAgICAgICAgIG1faml0LmxvYWQzMihNYWNy b0Fzc2VtYmxlcjo6QWRkcmVzcyhzdHJpbmdJbXBsR1BSLCBTdHJpbmdJbXBsOjpsZW5ndGhNZW1v cnlPZmZzZXQoKSksIHN0ckxlbmd0aEdQUik7CiAKLSAgICAgICAgR1BSUmVnIGluZGV4R1BSID0g c3RyaW5nSW1wbEdQUjsKLQotICAgICAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW0zMigwKSwgaW5k ZXhHUFIpOwotCisgICAgICAgIC8vIENsb2JiZXJpbmcgaW5wdXQgcmVnaXN0ZXJzIGlzIE9LIHNp bmNlIHdlIGFscmVhZHkgY2FsbGVkIGZsdXNoUmVnaXN0ZXJzLgogICAgICAgICBZYXJyOjpZYXJy SklUUmVnaXN0ZXJzIHlhcnJSZWdpc3RlcnM7CiAgICAgICAgIHlhcnJSZWdpc3RlcnMuaW5wdXQg PSBzdHJpbmdEYXRhR1BSOwotICAgICAgICB5YXJyUmVnaXN0ZXJzLmluZGV4ID0gaW5kZXhHUFI7 CisgICAgICAgIHlhcnJSZWdpc3RlcnMuaW5kZXggPSBzdHJpbmdJbXBsR1BSOwogICAgICAgICB5 YXJyUmVnaXN0ZXJzLmxlbmd0aCA9IHN0ckxlbmd0aEdQUjsKICAgICAgICAgeWFyclJlZ2lzdGVy cy5vdXRwdXQgPSBvdXRwdXRHUFI7CiAgICAgICAgIHlhcnJSZWdpc3RlcnMucmVnVDAgPSB0ZW1w MEdQUjsKQEAgLTI3ODAsMjAgKzI3NjMsMjAgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGls ZVJlZ0V4cFRlc3RJbmxpbmUoTm9kZSogbm9kZSkKICAgICAgICAgaWYgKGlubGluZUNvZGVTdGF0 czhCaXQubmVlZHNUZW1wMigpKQogICAgICAgICAgICAgeWFyclJlZ2lzdGVycy5yZWdUMiA9IHRl bXAyR1BSOwogCi0gICAgICAgIHlhcnJSZWdpc3RlcnMucmV0dXJuUmVnaXN0ZXIgPSByZXN1bHRH UFI7Ci0gICAgICAgIHlhcnJSZWdpc3RlcnMucmV0dXJuUmVnaXN0ZXIyID0gcmVzdWx0MkdQUjsK KyAgICAgICAgeWFyclJlZ2lzdGVycy5yZXR1cm5SZWdpc3RlciA9IHRlbXAwR1BSOworICAgICAg ICB5YXJyUmVnaXN0ZXJzLnJldHVyblJlZ2lzdGVyMiA9IHN0cmluZ0RhdGFHUFI7CiAKICAgICAg ICAgYXV0byBjb21tb25EYXRhID0gbV9qaXQuaml0Q29kZSgpLT5kZmdDb21tb24oKTsKKyAgICAg ICAgbV9qaXQubW92ZShUcnVzdGVkSW1tMzIoMCksIHlhcnJSZWdpc3RlcnMuaW5kZXgpOwogICAg ICAgICBZYXJyOjpqaXRDb21waWxlSW5saW5lZFRlc3QoJm1fZ3JhcGgubV9zdGFja0NoZWNrZXIs IHJlZ0V4cC0+cGF0dGVybigpLCByZWdFeHAtPmZsYWdzKCksIFlhcnI6OkNoYXJTaXplOjpDaGFy OCwgJnZtKCksIGNvbW1vbkRhdGEtPm1fYm95ZXJNb29yZURhdGEsIG1faml0LCB5YXJyUmVnaXN0 ZXJzKTsKIAotICAgICAgICBhdXRvIGZhaWxlZE1hdGNoID0gbV9qaXQuYnJhbmNoMzIoTWFjcm9B c3NlbWJsZXI6Okxlc3NUaGFuLCByZXN1bHRHUFIsIFRydXN0ZWRJbW0zMigwKSk7CisgICAgICAg IGF1dG8gZmFpbGVkTWF0Y2ggPSBtX2ppdC5icmFuY2gzMihNYWNyb0Fzc2VtYmxlcjo6TGVzc1Ro YW4sIHlhcnJSZWdpc3RlcnMucmV0dXJuUmVnaXN0ZXIsIFRydXN0ZWRJbW0zMigwKSk7CiAKICAg ICAgICAgLy8gIFNhdmVkIGNhY2hlZCByZXN1bHQKICNpZiBDUFUoWDg2XzY0KQogICAgICAgICBp ZiAoaW5saW5lQ29kZVN0YXRzOEJpdC5uZWVkc1RlbXAyKCkpIHsKICAgICAgICAgICAgIC8vIFNp bmNlIHdlIHJldXNlZCBnbG9iYWxPYmplY3RHUFIgZm9yIHRlbXAyLCBsZXQncyByZXN0b3JlIHRo ZSBnbG9iYWwgb2JqZWN0LgotICAgICAgICAgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVj dENvbnN0ID0ganNDYXN0PEpTR2xvYmFsT2JqZWN0Kj4obm9kZS0+Y2VsbE9wZXJhbmQoKS0+dmFs dWUoKSk7Ci0gICAgICAgICAgICBtX2ppdC5tb3ZlKENDYWxsSGVscGVyczo6VHJ1c3RlZEltbVB0 cihnbG9iYWxPYmplY3RDb25zdCksIGdsb2JhbE9iamVjdEdQUik7CisgICAgICAgICAgICBtX2pp dC5tb3ZlKFRydXN0ZWRJbW1QdHI6OndlYWtQb2ludGVyKG1fZ3JhcGgsIGpzQ2FzdDxKU0dsb2Jh bE9iamVjdCo+KG5vZGUtPmNlbGxPcGVyYW5kKCktPnZhbHVlKCkpKSwgZ2xvYmFsT2JqZWN0R1BS KTsKICAgICAgICAgfQogI2VuZGlmCiAKQEAgLTI4MDEsODAgKzI3ODQsNTYgQEAgdm9pZCBTcGVj dWxhdGl2ZUpJVDo6Y29tcGlsZVJlZ0V4cFRlc3RJbmxpbmUoTm9kZSogbm9kZSkKIAogICAgICAg ICBtX2ppdC5zdG9yZVB0cihUcnVzdGVkSW1tUHRyOjp3ZWFrUG9pbnRlcihtX2dyYXBoLCByZWdF eHApLCBKSVRDb21waWxlcjo6QWRkcmVzcyhnbG9iYWxPYmplY3RHUFIsIG9mZnNldCArIFJlZ0V4 cENhY2hlZFJlc3VsdDo6b2Zmc2V0T2ZMYXN0UmVnRXhwKCkpKTsKICAgICAgICAgbV9qaXQuc3Rv cmVQdHIoYXJndW1lbnRHUFIsIEpJVENvbXBpbGVyOjpBZGRyZXNzKGdsb2JhbE9iamVjdEdQUiwg b2Zmc2V0ICsgUmVnRXhwQ2FjaGVkUmVzdWx0OjpvZmZzZXRPZkxhc3RJbnB1dCgpKSk7Ci0gICAg ICAgIG1faml0LnN0b3JlMzIocmVzdWx0R1BSLCBKSVRDb21waWxlcjo6QWRkcmVzcyhnbG9iYWxP YmplY3RHUFIsIG9mZnNldCArIFJlZ0V4cENhY2hlZFJlc3VsdDo6b2Zmc2V0T2ZSZXN1bHQoKSAr IE9CSkVDVF9PRkZTRVRPRihNYXRjaFJlc3VsdCwgc3RhcnQpKSk7Ci0gICAgICAgIG1faml0LnN0 b3JlMzIocmVzdWx0MkdQUiwgSklUQ29tcGlsZXI6OkFkZHJlc3MoZ2xvYmFsT2JqZWN0R1BSLCBv ZmZzZXQgKyBSZWdFeHBDYWNoZWRSZXN1bHQ6Om9mZnNldE9mUmVzdWx0KCkgKyBPQkpFQ1RfT0ZG U0VUT0YoTWF0Y2hSZXN1bHQsIGVuZCkpKTsKKyAgICAgICAgbV9qaXQuc3RvcmUzMih5YXJyUmVn aXN0ZXJzLnJldHVyblJlZ2lzdGVyLCBKSVRDb21waWxlcjo6QWRkcmVzcyhnbG9iYWxPYmplY3RH UFIsIG9mZnNldCArIFJlZ0V4cENhY2hlZFJlc3VsdDo6b2Zmc2V0T2ZSZXN1bHQoKSArIE9CSkVD VF9PRkZTRVRPRihNYXRjaFJlc3VsdCwgc3RhcnQpKSk7CisgICAgICAgIG1faml0LnN0b3JlMzIo eWFyclJlZ2lzdGVycy5yZXR1cm5SZWdpc3RlcjIsIEpJVENvbXBpbGVyOjpBZGRyZXNzKGdsb2Jh bE9iamVjdEdQUiwgb2Zmc2V0ICsgUmVnRXhwQ2FjaGVkUmVzdWx0OjpvZmZzZXRPZlJlc3VsdCgp ICsgT0JKRUNUX09GRlNFVE9GKE1hdGNoUmVzdWx0LCBlbmQpKSk7CiAgICAgICAgIG1faml0LnN0 b3JlOChUcnVzdGVkSW1tMzIoMCksIEpJVENvbXBpbGVyOjpBZGRyZXNzKGdsb2JhbE9iamVjdEdQ Uiwgb2Zmc2V0ICsgUmVnRXhwQ2FjaGVkUmVzdWx0OjpvZmZzZXRPZlJlaWZpZWQoKSkpOwogCi0g ICAgICAgIGlmIChzd2FwUmVnICE9IEludmFsaWRHUFJSZWcpCi0gICAgICAgICAgICB1bmxvY2so c3dhcFJlZyk7CisgICAgICAgIENDYWxsSGVscGVyczo6SnVtcExpc3QgZG9uZUNhc2VzOwogCi0g ICAgICAgIG1faml0Lm1vdmUoVHJ1c3RlZEltbTMyKDEpLCByZXN1bHRHUFIpOwotICAgICAgICBk b25lLmFwcGVuZChtX2ppdC5qdW1wKCkpOworICAgICAgICBtX2ppdC5tb3ZlKFRydXN0ZWRJbW0z MigxKSwgdGVtcDBHUFIpOworICAgICAgICBkb25lQ2FzZXMuYXBwZW5kKG1faml0Lmp1bXAoKSk7 CiAKICAgICAgICAgZmFpbGVkTWF0Y2gubGluaygmbV9qaXQpOwotICAgICAgICBtX2ppdC5tb3Zl KFRydXN0ZWRJbW0zMigwKSwgcmVzdWx0R1BSKTsKLSAgICAgICAgZG9uZS5hcHBlbmQobV9qaXQu anVtcCgpKTsKKyAgICAgICAgbV9qaXQubW92ZShUcnVzdGVkSW1tMzIoMCksIHRlbXAwR1BSKTsK KyAgICAgICAgZG9uZUNhc2VzLmFwcGVuZChtX2ppdC5qdW1wKCkpOworCisgICAgICAgIHJldHVy biBkb25lQ2FzZXM7CiAgICAgfTsKIAogICAgIGlmIChub2RlLT5jaGlsZDMoKS51c2VLaW5kKCkg PT0gU3RyaW5nVXNlKSB7CiAgICAgICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGFyZ3VtZW50KHRo aXMsIG5vZGUtPmNoaWxkMygpKTsKLSAgICAgICAgYXJndW1lbnRHUFIgPSBhcmd1bWVudC5ncHIo KTsKKyAgICAgICAgR1BSUmVnIGFyZ3VtZW50R1BSID0gYXJndW1lbnQuZ3ByKCk7CiAgICAgICAg IHNwZWN1bGF0ZVN0cmluZyhub2RlLT5jaGlsZDMoKSwgYXJndW1lbnRHUFIpOwogCiAgICAgICAg IGZsdXNoUmVnaXN0ZXJzKCk7CiAKLSAgICAgICAgc3dhcFJlZ0lmTmVlZGVkKCk7Ci0KLSAgICAg ICAgbV9qaXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhhcmd1bWVudEdQUiwgSlNT dHJpbmc6Om9mZnNldE9mVmFsdWUoKSksIHN0cmluZ0ltcGxHUFIpOwotICAgICAgICAvLyBJZiB0 aGUgc3RyaW5nIGlzIGEgcm9wZSBvciAxNiBiaXQsIHdlIGNhbGwgdGhlIG9wZXJhdGlvbi4KLSAg ICAgICAgb3BlcmF0aW9uQ2FzZXMuYXBwZW5kKG1faml0LmJyYW5jaElmUm9wZVN0cmluZ0ltcGwo c3RyaW5nSW1wbEdQUikpOwotICAgICAgICBvcGVyYXRpb25DYXNlcy5hcHBlbmQobV9qaXQuYnJh bmNoVGVzdDMyKAotICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Olplcm8sCi0gICAgICAgICAg ICBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhzdHJpbmdJbXBsR1BSLCBTdHJpbmdJbXBsOjpmbGFn c09mZnNldCgpKSwKLSAgICAgICAgICAgIFRydXN0ZWRJbW0zMihTdHJpbmdJbXBsOjpmbGFnSXM4 Qml0KCkpKSk7Ci0KLSAgICAgICAgcmVnRXhwVGVzdElubGluZUNhc2UoKTsKLQotICAgICAgICBv cGVyYXRpb25DYXNlcy5saW5rKCZtX2ppdCk7Ci0KLSAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVy YXRpb25SZWdFeHBUZXN0U3RyaW5nLCByZXN1bHRHUFIsIGdsb2JhbE9iamVjdEdQUiwgYmFzZUdQ UiwgYXJndW1lbnRHUFIpOworICAgICAgICBhdXRvIGRvbmVDYXNlcyA9IHJlZ0V4cFRlc3RJbmxp bmVDYXNlKGFyZ3VtZW50R1BSLCBzbG93Q2FzZXMpOwogCisgICAgICAgIHNsb3dDYXNlcy5saW5r KCZtX2ppdCk7CisgICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uUmVnRXhwVGVzdFN0cmlu ZywgdGVtcDBHUFIsIGdsb2JhbE9iamVjdEdQUiwgYmFzZUdQUiwgYXJndW1lbnRHUFIpOwogICAg ICAgICBtX2ppdC5leGNlcHRpb25DaGVjaygpOwogCi0gICAgICAgIGRvbmUubGluaygmbV9qaXQp OwotICAgICAgICB1bmJsZXNzZWRCb29sZWFuUmVzdWx0KHJlc3VsdEdQUiwgbm9kZSk7Ci0KKyAg ICAgICAgZG9uZUNhc2VzLmxpbmsoJm1faml0KTsKKyAgICAgICAgdW5ibGVzc2VkQm9vbGVhblJl c3VsdCh0ZW1wMEdQUiwgbm9kZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBKU1Zh bHVlT3BlcmFuZCBhcmd1bWVudCh0aGlzLCBub2RlLT5jaGlsZDMoKSk7Ci0gICAgYXJndW1lbnRH UFIgPSBhcmd1bWVudC5ncHIoKTsKKyAgICBHUFJSZWcgYXJndW1lbnRHUFIgPSBhcmd1bWVudC5n cHIoKTsKIAogICAgIGZsdXNoUmVnaXN0ZXJzKCk7CiAKLSAgICBzd2FwUmVnSWZOZWVkZWQoKTsK LQotICAgIG9wZXJhdGlvbkNhc2VzLmFwcGVuZChtX2ppdC5icmFuY2hJZk5vdENlbGwoYXJndW1l bnRHUFIpKTsKLSAgICBvcGVyYXRpb25DYXNlcy5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RTdHJp bmcoYXJndW1lbnRHUFIpKTsKLQotICAgIG1faml0LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFk ZHJlc3MoYXJndW1lbnRHUFIsIEpTU3RyaW5nOjpvZmZzZXRPZlZhbHVlKCkpLCBzdHJpbmdJbXBs R1BSKTsKLSAgICAvLyBJZiB0aGUgc3RyaW5nIGlzIGEgcm9wZSBvciAxNiBiaXQsIHdlIGNhbGwg dGhlIG9wZXJhdGlvbi4KLSAgICBvcGVyYXRpb25DYXNlcy5hcHBlbmQobV9qaXQuYnJhbmNoSWZS b3BlU3RyaW5nSW1wbChzdHJpbmdJbXBsR1BSKSk7Ci0gICAgb3BlcmF0aW9uQ2FzZXMuYXBwZW5k KG1faml0LmJyYW5jaFRlc3QzMigKLSAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Olplcm8sCi0gICAg ICAgIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHN0cmluZ0ltcGxHUFIsIFN0cmluZ0ltcGw6OmZs YWdzT2Zmc2V0KCkpLAotICAgICAgICBUcnVzdGVkSW1tMzIoU3RyaW5nSW1wbDo6ZmxhZ0lzOEJp dCgpKSkpOworICAgIHNsb3dDYXNlcy5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RDZWxsKGFyZ3Vt ZW50R1BSKSk7CisgICAgc2xvd0Nhc2VzLmFwcGVuZChtX2ppdC5icmFuY2hJZk5vdFN0cmluZyhh cmd1bWVudEdQUikpOwogCi0gICAgcmVnRXhwVGVzdElubGluZUNhc2UoKTsKKyAgICBhdXRvIGRv bmVDYXNlcyA9IHJlZ0V4cFRlc3RJbmxpbmVDYXNlKGFyZ3VtZW50R1BSLCBzbG93Q2FzZXMpOwog Ci0gICAgb3BlcmF0aW9uQ2FzZXMubGluaygmbV9qaXQpOwotCi0gICAgY2FsbE9wZXJhdGlvbihv cGVyYXRpb25SZWdFeHBUZXN0LCByZXN1bHRHUFIsIGdsb2JhbE9iamVjdEdQUiwgYmFzZUdQUiwg YXJndW1lbnRHUFIpOwotCi0gICAgZG9uZS5saW5rKCZtX2ppdCk7CisgICAgc2xvd0Nhc2VzLmxp bmsoJm1faml0KTsKKyAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblJlZ0V4cFRlc3QsIHRlbXAw R1BSLCBnbG9iYWxPYmplY3RHUFIsIGJhc2VHUFIsIGFyZ3VtZW50R1BSKTsKICAgICBtX2ppdC5l eGNlcHRpb25DaGVjaygpOwogCi0gICAgdW5ibGVzc2VkQm9vbGVhblJlc3VsdChyZXN1bHRHUFIs IG5vZGUpOworICAgIGRvbmVDYXNlcy5saW5rKCZtX2ppdCk7CisgICAgdW5ibGVzc2VkQm9vbGVh blJlc3VsdCh0ZW1wMEdQUiwgbm9kZSk7CiB9CiAjZWxzZQogdm9pZCBTcGVjdWxhdGl2ZUpJVDo6 Y29tcGlsZVJlZ0V4cFRlc3RJbmxpbmUoTm9kZSogbm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lh cnIvWWFyckpJVC5jcHAKaW5kZXggOGM4Y2Q1NTY0YzliODBhOTlhMzE1ZWM1YzU0MDMzNTkwNjc1 ZjMyYy4uNmUxMTA2YmNhOGNmYTMzOTY5NmYyMmNkMDQyMDFkZDk3NmFiMmFjMSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAKQEAgLTQwMzMsNiArNDAzMyw3IEBAIGNsYXNz IFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8gewogI2lmIENQVShYODZf NjQpCiAjaWYgT1MoV0lORE9XUykKICAgICAgICAgLy8gU3RvcmUgdGhlIHJldHVybiB2YWx1ZSBp biB0aGUgYWxsb2NhdGVkIHNwYWNlIHBvaW50ZWQgYnkgcmN4LgorICAgICAgICBBU1NFUlQobm9P dmVybGFwKFg4NlJlZ2lzdGVyczo6ZWN4LCBtX3JlZ3MucmV0dXJuUmVnaXN0ZXIsIG1fcmVncy5y ZXR1cm5SZWdpc3RlcjIpKTsKICAgICAgICAgbV9qaXQucG9wKFg4NlJlZ2lzdGVyczo6ZWN4KTsK ICAgICAgICAgbV9qaXQuc3RvcmU2NChtX3JlZ3MucmV0dXJuUmVnaXN0ZXIsIE1hY3JvQXNzZW1i bGVyOjpBZGRyZXNzKFg4NlJlZ2lzdGVyczo6ZWN4KSk7CiAgICAgICAgIG1faml0LnN0b3JlNjQo bV9yZWdzLnJldHVyblJlZ2lzdGVyMiwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoWDg2UmVnaXN0 ZXJzOjplY3gsIHNpemVvZih2b2lkKikpKTsKQEAgLTQ3NTAsNiArNDc1MSw4IEBAIHZvaWQgaml0 Q29tcGlsZUlubGluZWRUZXN0KFN0YWNrQ2hlY2sqIG1fY29tcGlsYXRpb25UaHJlYWRTdGFja0No ZWNrZXIsIGNvbnN0IFN0CiAgICAgWWFycjo6RXJyb3JDb2RlIGVycm9yQ29kZTsKICAgICBZYXJy OjpZYXJyUGF0dGVybiBwYXR0ZXJuKHBhdHRlcm5TdHJpbmcsIGZsYWdzLCBlcnJvckNvZGUpOwog CisgICAgaml0UmVnaXN0ZXJzLnZhbGlkYXRlKCk7CisKICAgICBZYXJyR2VuZXJhdG9yPFlhcnJK SVRSZWdpc3RlcnM+IHlhcnJHZW5lcmF0b3Ioaml0LCB2bSwgJmJveWVyTW9vcmVEYXRhLCBqaXRS ZWdpc3RlcnMsIHBhdHRlcm4sIHBhdHRlcm5TdHJpbmcsIGNoYXJTaXplLCBKSVRDb21waWxlTW9k ZTo6SW5saW5lVGVzdCk7CiAgICAgeWFyckdlbmVyYXRvci5zZXRTdGFja0NoZWNrZXIobV9jb21w aWxhdGlvblRocmVhZFN0YWNrQ2hlY2tlcik7CiAgICAgeWFyckdlbmVyYXRvci5jb21waWxlSW5s aW5lKGJveWVyTW9vcmVEYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95 YXJyL1lhcnJKSVRSZWdpc3RlcnMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJK SVRSZWdpc3RlcnMuaAppbmRleCBlOGZhZTE1OWEyYzg3MjYxZDA0YmFiNjQyZDcyN2VjY2I1NzM5 Yzk4Li4xZjFmODg1YTBmNjVmM2Y3ZTcwNjU1YmNlZDZkZGI4ZGQzYjg3NzMwIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklUUmVnaXN0ZXJzLmgKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVFJlZ2lzdGVycy5oCkBAIC0xNzUsOCArMTc1 LDMwIEBAIHN0cnVjdCBZYXJySklURGVmYXVsdFJlZ2lzdGVycyB7CiAjaWYgRU5BQkxFKFlBUlJf SklUX1JFR0VYUF9URVNUX0lOTElORSkKIGNsYXNzIFlhcnJKSVRSZWdpc3RlcnMgewogcHVibGlj OgotICAgIFlhcnJKSVRSZWdpc3RlcnMoKQorICAgIFlhcnJKSVRSZWdpc3RlcnMoKSA9IGRlZmF1 bHQ7CisKKyAgICB2b2lkIHZhbGlkYXRlKCkKICAgICB7CisjaWYgQVNTRVJUX0VOQUJMRUQKKyAg ICAgICAgQVNTRVJUKGlucHV0ICE9IEludmFsaWRHUFJSZWcpOworICAgICAgICBBU1NFUlQoaW5k ZXggIT0gSW52YWxpZEdQUlJlZyk7CisgICAgICAgIEFTU0VSVChsZW5ndGggIT0gSW52YWxpZEdQ UlJlZyk7CisgICAgICAgIEFTU0VSVChvdXRwdXQgIT0gSW52YWxpZEdQUlJlZyk7CisKKyAgICAg ICAgQVNTRVJUKHJldHVyblJlZ2lzdGVyICE9IEludmFsaWRHUFJSZWcpOworICAgICAgICBBU1NF UlQocmV0dXJuUmVnaXN0ZXIyICE9IEludmFsaWRHUFJSZWcpOworCisgICAgICAgIEFTU0VSVChy ZWdUMCAhPSBJbnZhbGlkR1BSUmVnKTsKKyAgICAgICAgQVNTRVJUKHJlZ1QxICE9IEludmFsaWRH UFJSZWcpOworCisgICAgICAgIEFTU0VSVChub092ZXJsYXAoaW5wdXQsIGluZGV4LCBsZW5ndGgs IG91dHB1dCwgcmVnVDAsIHJlZ1QxKSk7CisgICAgICAgIEFTU0VSVChub092ZXJsYXAocmV0dXJu UmVnaXN0ZXIsIHJldHVyblJlZ2lzdGVyMikpOworICAgICAgICBBU1NFUlQobm9PdmVybGFwKGlu ZGV4LCByZXR1cm5SZWdpc3RlcikpOworCisjaWYgQ1BVKFg4Nl82NCkgJiYgT1MoV0lORE9XUykK KyAgICAgICAgQVNTRVJUKG5vT3ZlcmxhcChYODZSZWdpc3RlcnM6OmVjeCwgcmV0dXJuUmVnaXN0 ZXIsIG1fcmVncy5yZXR1cm5SZWdpc3RlcjIpKTsKKyNlbmRpZgorI2VuZGlmCiAgICAgfQogCiAg ICAgLy8gQXJndW1lbnQgcmVnaXN0ZXJzCkBAIC0xODQsNiArMjA2LDcgQEAgY2xhc3MgWWFyckpJ VFJlZ2lzdGVycyB7CiAgICAgR1BSUmVnIGluZGV4IHsgSW52YWxpZEdQUlJlZyB9OwogICAgIEdQ UlJlZyBsZW5ndGggeyBJbnZhbGlkR1BSUmVnIH07CiAgICAgR1BSUmVnIG91dHB1dCB7IEludmFs aWRHUFJSZWcgfTsKKwogICAgIEdQUlJlZyBtYXRjaGluZ0NvbnRleHQgeyBJbnZhbGlkR1BSUmVn IH07CiAgICAgR1BSUmVnIGZyZWVsaXN0UmVnaXN0ZXIgeyBJbnZhbGlkR1BSUmVnIH07CiAgICAg R1BSUmVnIGZyZWVsaXN0U2l6ZVJlZ2lzdGVyIHsgSW52YWxpZEdQUlJlZyB9Owo=