180208 2017-11-30 11:17:04 -0800 [JSC] Remove easy toRemove & map.remove() use in OAS phase 2017-11-30 17:02:52 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 180225 1 ysuzuki ysuzuki benjamin cdumez cmarcelo commit-queue dbates ews-watchlist fpizlo keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1376415 0 ysuzuki 2017-11-30 11:17:04 -0800 [JSC] Remove easy toRemove & map.remove() use 1376419 1 327997 ysuzuki 2017-11-30 11:19:15 -0800 Created attachment 327997 Patch 1376558 2 327997 mark.lam 2017-11-30 15:30:41 -0800 Comment on attachment 327997 Patch r=me 1376578 3 ysuzuki 2017-11-30 15:44:30 -0800 Committed r225362: <https://trac.webkit.org/changeset/225362> 1376579 4 webkit-bug-importer 2017-11-30 15:45:34 -0800 <rdar://problem/35784818> 1376603 5 commit-queue 2017-11-30 16:11:59 -0800 Re-opened since this is blocked by bug 180225 1376611 6 ysuzuki 2017-11-30 16:17:15 -0800 It seems that DFGArgumentsEliminationPhase's change is bad one. But other ones are OK. But basically this is optimization. I would like to keep applying this only to super simple and apparently correct ones. Like ones in DFGObjectAllocationSinkingPhase.cpp. I think applying this to DFGObjectAllocationSinkingPhase.cpp is worth doing since basically DFGObjectAllocationSinkingPhase.cpp is known as super slow. I'll only apply this change to DFGObjectAllocationSinkingPhase.cpp. 1376621 7 328051 ysuzuki 2017-11-30 16:22:55 -0800 Created attachment 328051 Patch 1376624 8 328051 mark.lam 2017-11-30 16:29:06 -0800 Comment on attachment 328051 Patch r=me 1376625 9 328051 ysuzuki 2017-11-30 16:29:37 -0800 Comment on attachment 328051 Patch Thank you! 1376659 10 328051 commit-queue 2017-11-30 17:02:51 -0800 Comment on attachment 328051 Patch Clearing flags on attachment: 328051 Committed r225375: <https://trac.webkit.org/changeset/225375> 1376660 11 commit-queue 2017-11-30 17:02:52 -0800 All reviewed patches have been landed. Closing bug. 327997 2017-11-30 11:19:15 -0800 2017-11-30 16:22:53 -0800 Patch bug-180208-20171201041914.patch text/plain 11063 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy Njk4ODVjMGZhZjg5ODhhZDZhZTI2NjZiMGVhMGFlYWE4ZGUxMmUzLi42MjQ3ZjhmNWRkNGE3MmU2 MzFmOWFhMjllOTRmYzc4NmE5YzRlYjQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMiBAQAogMjAxNy0xMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBbSlNDXSBSZW1vdmUgZWFzeSB0b1JlbW92ZSAmIG1hcC5yZW1vdmUo KSB1c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 MDIwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElu IHRoaXMgcGF0Y2gsIHdlIHJlcGxhY2UgVmVjdG9yPD4gdG9SZW1vdmUgJiBtYXAucmVtb3ZlIGxv b3Agd2l0aCByZW1vdmVJZiwKKyAgICAgICAgdG8gb3B0aW1pemUgdGhpcyBjb21tb24gcGF0dGVy bi4gVGhpcyBwYXRjaCBvbmx5IG1vZGlmaWVzIGFwcGFyZW50IG9uZXMuCisgICAgICAgIEJ1dCB3 ZSBjYW4gYXBwbHkgdGhpcyByZWZhY3RvcmluZyBmdXJ0aGVyIHRvIE9BUyBwaGFzZSBpbiB0aGUg ZnV0dXJlLgorCisgICAgICAgICogYjMvQjNNb3ZlQ29uc3RhbnRzLmNwcDoKKyAgICAgICAgKiBk ZmcvREZHQXJndW1lbnRzRWxpbWluYXRpb25QaGFzZS5jcHA6CisgICAgICAgICogZGZnL0RGR09i amVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UuY3BwOgorICAgICAgICAqIHdhc20vV2FzbVNpZ25h dHVyZS5jcHA6CisgICAgICAgIChKU0M6Oldhc206OlNpZ25hdHVyZUluZm9ybWF0aW9uOjp0cnlD bGVhbnVwKToKKworMjAxNy0xMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKwogICAgICAgICBSRUdSRVNTSU9OKHIyMjUzMTQpOiBbTGludXhdIE1vcmUgdGhhbiAy MDAwIGpzYyB0ZXN0cyBhcmUgZmFpbGluZyBhZnRlciByMjI1MzE0CiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAxODUKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCA0OGYxZjY1NGVj MzkyZjJhNzYxZWQzZTI1NjAzYWQwYmVjNDBiNWJiLi5lMTBiN2U2MTE0ZjZjNDAzY2VlOTk5M2I1 MGZjYTgxOTFkMDgxOWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTExLTMwICBZdXN1a2Ug U3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgorCisgICAgICAgIFtKU0NdIFJlbW92ZSBl YXN5IHRvUmVtb3ZlICYgbWFwLnJlbW92ZSgpIHVzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwMjA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJuIGJvb2wgZnJvbSByZW1vdmVJZi4gSXQgaXMg dHJ1ZSBpZiByZW1vdmVJZiByZW1vdmVzIGF0IGxlYXN0IG9uZSBlbnRyeS4KKyAgICAgICAgVGhp cyBpbnRlcmZhY2UgaXMgc2ltaWxhciB0byBleGlzdGluZyBIYXNoU2V0OjpyZW1vdmUsIHdoaWNo IHJldHVybnMgdHJ1ZQorICAgICAgICBpZiBpdCBhY3R1YWxseSByZW1vdmVzIGVudHJ5LgorCisg ICAgICAgICogd3RmL0hhc2hNYXAuaDoKKyAgICAgICAgKFdURjo6WD46OnJlbW92ZUlmKToKKyAg ICAgICAgKiB3dGYvSGFzaFNldC5oOgorICAgICAgICAoV1RGOjpWPjo6cmVtb3ZlSWYpOgorICAg ICAgICAqIHd0Zi9IYXNoVGFibGUuaDoKKyAgICAgICAgKFdURjo6S2V5VHJhaXRzPjo6cmVtb3Zl SWYpOgorCiAyMDE3LTExLTI5ICBKRiBCYXN0aWVuICA8amZiYXN0aWVuQGFwcGxlLmNvbT4KIAog ICAgICAgICBXVEYgLyBibWFsbG9jOiBkb24ndCB3cml0ZSB0byAweGJiYWRiZWVmIHdoZW4gQVNB TiBpcyBsb29raW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNNb3Zl Q29uc3RhbnRzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM01vdmVDb25zdGFudHMu Y3BwCmluZGV4IGQzZWQ5NzliOTU2YjE1YWUxOTg3OGYzZDRmOGYwOWEwODE4OTRiOTMuLmM5ODE3 MmJkN2Q2YjZmNjc1NTc2OTY1OGViYTk4OGQ1Y2M4NTUzMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9iMy9CM01vdmVDb25zdGFudHMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9iMy9CM01vdmVDb25zdGFudHMuY3BwCkBAIC0zNDIsMTAgKzM0Miw4IEBAIGNsYXNz IE1vdmVDb25zdGFudHMgewogICAgIH0KIAogICAgIFByb2NlZHVyZSYgbV9wcm9jOwotICAgIFZl Y3RvcjxWYWx1ZSo+IG1fdG9SZW1vdmU7CiAgICAgSGFzaE1hcDxWYWx1ZUtleSwgdW5zaWduZWQ+ IG1fY29uc3RUYWJsZTsKICAgICBpbnQ2NF90KiBtX2RhdGFTZWN0aW9uOwotICAgIEhhc2hNYXA8 VmFsdWVLZXksIFZhbHVlKj4gbV9jb25zdGFudHM7CiAgICAgSW5zZXJ0aW9uU2V0IG1faW5zZXJ0 aW9uU2V0OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdB cmd1bWVudHNFbGltaW5hdGlvblBoYXNlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHQXJndW1lbnRzRWxpbWluYXRpb25QaGFzZS5jcHAKaW5kZXggYmYxYjllYmEzNGRjZTk2MzYw MmVjMjFiM2NmYTA2ZTJmYjY5MzNjZC4uOTI5ZDEwMDlkY2ZhNmY3YjY2ZGI4NTI2YTJlMjIyZDFk ZDFjNmE5MiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBcmd1bWVu dHNFbGltaW5hdGlvblBoYXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0FyZ3VtZW50c0VsaW1pbmF0aW9uUGhhc2UuY3BwCkBAIC0xOTIsMjAgKzE5MiwxMCBAQCBjbGFz cyBBcmd1bWVudHNFbGltaW5hdGlvblBoYXNlIDogcHVibGljIFBoYXNlIHsKICAgICB7CiAgICAg ICAgIGJvb2wgY2hhbmdlZDsKICAgICAgICAgZG8gewotICAgICAgICAgICAgY2hhbmdlZCA9IGZh bHNlOwotICAgICAgICAgICAgVmVjdG9yPE5vZGUqLCAxPiB0b1JlbW92ZTsKLQotICAgICAgICAg ICAgZm9yIChOb2RlKiBjYW5kaWRhdGUgOiBtX2NhbmRpZGF0ZXMpIHsKLSAgICAgICAgICAgICAg ICBpZiAoIWlzU3RpbGxWYWxpZENhbmRpZGF0ZShjYW5kaWRhdGUpKQotICAgICAgICAgICAgICAg ICAgICB0b1JlbW92ZS5hcHBlbmQoY2FuZGlkYXRlKTsKLSAgICAgICAgICAgIH0KLQotICAgICAg ICAgICAgaWYgKHRvUmVtb3ZlLnNpemUoKSkgewotICAgICAgICAgICAgICAgIGNoYW5nZWQgPSB0 cnVlOwotICAgICAgICAgICAgICAgIGZvciAoTm9kZSogbm9kZSA6IHRvUmVtb3ZlKQotICAgICAg ICAgICAgICAgICAgICBtX2NhbmRpZGF0ZXMucmVtb3ZlKG5vZGUpOwotICAgICAgICAgICAgfQot CisgICAgICAgICAgICBjaGFuZ2VkID0gbV9jYW5kaWRhdGVzLnJlbW92ZUlmKAorICAgICAgICAg ICAgICAgIFsmXSAoTm9kZSogY2FuZGlkYXRlKSB7CisgICAgICAgICAgICAgICAgICAgIHJldHVy biAhaXNTdGlsbFZhbGlkQ2FuZGlkYXRlKGNhbmRpZGF0ZSk7CisgICAgICAgICAgICAgICAgfSk7 CiAgICAgICAgIH0gd2hpbGUgKGNoYW5nZWQpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPYmplY3RBbGxvY2F0aW9uU2lua2luZ1BoYXNlLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFz ZS5jcHAKaW5kZXggM2ZkYTdkNDBiMDg2YmQxOWMzYzI4YjBhNjBkYWQxNTc1ZWY2MGMzNy4uODE3 MWI2ZWNkNjU4NTNiOWIyNTZkODIzNWVkNWFkNGI1ZjNhNjg1NSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPYmplY3RBbGxvY2F0aW9uU2lua2luZ1BoYXNlLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09iamVjdEFsbG9jYXRpb25TaW5raW5n UGhhc2UuY3BwCkBAIC01MDcsMTQgKzUwNywxMCBAQCBjbGFzcyBMb2NhbEhlYXAgewogCiAgICAg dm9pZCBwcnVuZUJ5TGl2ZW5lc3MoY29uc3QgTm9kZVNldCYgbGl2ZSkKICAgICB7Ci0gICAgICAg IFZlY3RvcjxOb2RlKj4gdG9SZW1vdmU7Ci0gICAgICAgIGZvciAoY29uc3QgYXV0byYgZW50cnkg OiBtX3BvaW50ZXJzKSB7Ci0gICAgICAgICAgICBpZiAoIWxpdmUuY29udGFpbnMoZW50cnkua2V5 KSkKLSAgICAgICAgICAgICAgICB0b1JlbW92ZS5hcHBlbmQoZW50cnkua2V5KTsKLSAgICAgICAg fQotICAgICAgICBmb3IgKE5vZGUqIG5vZGUgOiB0b1JlbW92ZSkKLSAgICAgICAgICAgIG1fcG9p bnRlcnMucmVtb3ZlKG5vZGUpOwotCisgICAgICAgIG1fcG9pbnRlcnMucmVtb3ZlSWYoCisgICAg ICAgICAgICBbJl0gKGNvbnN0IGF1dG8mIGVudHJ5KSB7CisgICAgICAgICAgICAgICAgcmV0dXJu ICFsaXZlLmNvbnRhaW5zKGVudHJ5LmtleSk7CisgICAgICAgICAgICB9KTsKICAgICAgICAgcHJ1 bmUoKTsKICAgICB9CiAKQEAgLTY4MiwxNSArNjc4LDEwIEBAIGNsYXNzIExvY2FsSGVhcCB7CiAg ICAgICAgIH0KIAogICAgICAgICAvLyBSZW1vdmUgdW5yZWFjaGFibGUgYWxsb2NhdGlvbnMKLSAg ICAgICAgewotICAgICAgICAgICAgVmVjdG9yPE5vZGUqPiB0b1JlbW92ZTsKLSAgICAgICAgICAg IGZvciAoY29uc3QgYXV0byYgZW50cnkgOiBtX2FsbG9jYXRpb25zKSB7Ci0gICAgICAgICAgICAg ICAgaWYgKCFyZWFjaGFibGUuY29udGFpbnMoZW50cnkua2V5KSkKLSAgICAgICAgICAgICAgICAg ICAgdG9SZW1vdmUuYXBwZW5kKGVudHJ5LmtleSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAg ICBmb3IgKE5vZGUqIGlkZW50aWZpZXIgOiB0b1JlbW92ZSkKLSAgICAgICAgICAgICAgICBtX2Fs bG9jYXRpb25zLnJlbW92ZShpZGVudGlmaWVyKTsKLSAgICAgICAgfQorICAgICAgICBtX2FsbG9j YXRpb25zLnJlbW92ZUlmKAorICAgICAgICAgICAgWyZdIChjb25zdCBhdXRvJiBlbnRyeSkgewor ICAgICAgICAgICAgICAgIHJldHVybiAhcmVhY2hhYmxlLmNvbnRhaW5zKGVudHJ5LmtleSk7Cisg ICAgICAgICAgICB9KTsKICAgICB9CiAKICAgICBib29sIG1fcmVhY2hlZCA9IGZhbHNlOwpAQCAt MTI0OSwxNCArMTI0MCwxMCBAQCBjbGFzcyBPYmplY3RBbGxvY2F0aW9uU2lua2luZ1BoYXNlIDog cHVibGljIFBoYXNlIHsKICAgICB7CiAgICAgICAgIC8vIFdlIGRvbid0IGNyZWF0ZSBtYXRlcmlh bGl6YXRpb25zIGlmIHRoZSBlc2NhcGVlIGlzIG5vdCBhCiAgICAgICAgIC8vIHNpbmsgY2FuZGlk YXRlCi0gICAgICAgIFZlY3RvcjxOb2RlKj4gdG9SZW1vdmU7Ci0gICAgICAgIGZvciAoY29uc3Qg YXV0byYgZW50cnkgOiBlc2NhcGVlcykgewotICAgICAgICAgICAgaWYgKCFtX3NpbmtDYW5kaWRh dGVzLmNvbnRhaW5zKGVudHJ5LmtleSkpCi0gICAgICAgICAgICAgICAgdG9SZW1vdmUuYXBwZW5k KGVudHJ5LmtleSk7Ci0gICAgICAgIH0KLSAgICAgICAgZm9yIChOb2RlKiBpZGVudGlmaWVyIDog dG9SZW1vdmUpCi0gICAgICAgICAgICBlc2NhcGVlcy5yZW1vdmUoaWRlbnRpZmllcik7Ci0KKyAg ICAgICAgZXNjYXBlZXMucmVtb3ZlSWYoCisgICAgICAgICAgICBbJl0gKGNvbnN0IGF1dG8mIGVu dHJ5KSB7CisgICAgICAgICAgICAgICAgcmV0dXJuICFtX3NpbmtDYW5kaWRhdGVzLmNvbnRhaW5z KGVudHJ5LmtleSk7CisgICAgICAgICAgICB9KTsKICAgICAgICAgaWYgKGVzY2FwZWVzLmlzRW1w dHkoKSkKICAgICAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3dhc20vV2FzbVNpZ25hdHVyZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2Fz bS9XYXNtU2lnbmF0dXJlLmNwcAppbmRleCA2YTQyZDUxNzE5NWVhNGZiNjFkOTJiMTBjOGNjMzc3 MzY3YzJlYjlkLi4yYzkzMGFjZDJlYTkyNjY2ZTkzOWFjZTQzNGUwMWM5ZDg1MjdiNWE2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtU2lnbmF0dXJlLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtU2lnbmF0dXJlLmNwcApAQCAtMTQ0LDIw ICsxNDQsMTggQEAgdm9pZCBTaWduYXR1cmVJbmZvcm1hdGlvbjo6dHJ5Q2xlYW51cCgpCiAgICAg U2lnbmF0dXJlSW5mb3JtYXRpb24mIGluZm8gPSBzaW5nbGV0b24oKTsKICAgICBMb2NrSG9sZGVy IGxvY2soaW5mby5tX2xvY2spOwogCi0gICAgVmVjdG9yPHN0ZDo6cGFpcjxTaWduYXR1cmVJbmRl eCwgU2lnbmF0dXJlKj4+IHRvUmVtb3ZlOwotICAgIGZvciAoY29uc3QgYXV0byYgcGFpciA6IGlu Zm8ubV9pbmRleE1hcCkgewotICAgICAgICBjb25zdCBSZWY8U2lnbmF0dXJlPiYgc2lnbmF0dXJl ID0gcGFpci52YWx1ZTsKLSAgICAgICAgaWYgKHNpZ25hdHVyZS0+cmVmQ291bnQoKSA9PSAxKSB7 Ci0gICAgICAgICAgICAvLyBXZSdyZSB0aGUgb25seSBvd25lci4KLSAgICAgICAgICAgIHRvUmVt b3ZlLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihwYWlyLmtleSwgc2lnbmF0dXJlLnB0cigpKSk7Ci0g ICAgICAgIH0KLSAgICB9Ci0gICAgZm9yIChjb25zdCBhdXRvJiBwYWlyIDogdG9SZW1vdmUpIHsK LSAgICAgICAgYm9vbCByZW1vdmVkID0gaW5mby5tX3NpZ25hdHVyZU1hcC5yZW1vdmUoU2lnbmF0 dXJlSGFzaCB7IHBhaXIuc2Vjb25kIH0pOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHJlbW92ZWQs IHJlbW92ZWQpOwotICAgICAgICByZW1vdmVkID0gaW5mby5tX2luZGV4TWFwLnJlbW92ZShwYWly LmZpcnN0KTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChyZW1vdmVkLCByZW1vdmVkKTsKLSAgICB9 CisgICAgaW5mby5tX2luZGV4TWFwLnJlbW92ZUlmKAorICAgICAgICBbJl0gKGNvbnN0IGF1dG8m IHBhaXIpIHsKKyAgICAgICAgICAgIGNvbnN0IFJlZjxTaWduYXR1cmU+JiBzaWduYXR1cmUgPSBw YWlyLnZhbHVlOworICAgICAgICAgICAgaWYgKHNpZ25hdHVyZS0+cmVmQ291bnQoKSA9PSAxKSB7 CisgICAgICAgICAgICAgICAgLy8gV2UncmUgdGhlIG9ubHkgb3duZXIuCisgICAgICAgICAgICAg ICAgYm9vbCByZW1vdmVkID0gaW5mby5tX3NpZ25hdHVyZU1hcC5yZW1vdmUoU2lnbmF0dXJlSGFz aCB7IHNpZ25hdHVyZS5wdHIoKSB9KTsKKyAgICAgICAgICAgICAgICBBU1NFUlRfVU5VU0VEKHJl bW92ZWQsIHJlbW92ZWQpOworICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9KTsKKwogICAgIGlmIChp bmZvLm1fc2lnbmF0dXJlTWFwLmlzRW1wdHkoKSkgewogICAgICAgICBBU1NFUlQoaW5mby5tX2lu ZGV4TWFwLmlzRW1wdHkoKSk7CiAgICAgICAgIGluZm8ubV9uZXh0SW5kZXggPSBTaWduYXR1cmU6 OmZpcnN0VmFsaWRJbmRleDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0hhc2hNYXAuaCBi L1NvdXJjZS9XVEYvd3RmL0hhc2hNYXAuaAppbmRleCBlNGNmNmJhZmVhNWQ1NDFjNmM4NzQ5ZGVk ODQwMjJhN2E0MGUxMmQyLi4zNGU3MmZmMGYxODU2NzljZDM4YmY2NzVhZWIzZjJiNzA5YTY0OTJh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9IYXNoTWFwLmgKKysrIGIvU291cmNlL1dURi93 dGYvSGFzaE1hcC5oCkBAIC0xMzUsNyArMTM1LDcgQEAgY2xhc3MgSGFzaE1hcCBmaW5hbCB7CiAg ICAgYm9vbCByZW1vdmUoY29uc3QgS2V5VHlwZSYpOwogICAgIGJvb2wgcmVtb3ZlKGl0ZXJhdG9y KTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgotICAgIHZvaWQgcmVtb3ZlSWYoRnVu Y3RvciYmKTsKKyAgICBib29sIHJlbW92ZUlmKEZ1bmN0b3ImJik7CiAgICAgdm9pZCBjbGVhcigp OwogCiAgICAgTWFwcGVkVGFrZVR5cGUgdGFrZShjb25zdCBLZXlUeXBlJik7IC8vIGVmZmljaWVu dCBjb21iaW5hdGlvbiBvZiBnZXQgd2l0aCByZW1vdmUKQEAgLTQ0Myw5ICs0NDMsOSBAQCBpbmxp bmUgYm9vbCBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjpyZW1vdmUoaXRlcmF0b3IgaXQpCiAKIHRl bXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFUsIHR5cGVuYW1lIFYsIHR5cGVuYW1lIFcsIHR5 cGVuYW1lIFg+CiB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgotaW5saW5lIHZvaWQgSGFzaE1h cDxULCBVLCBWLCBXLCBYPjo6cmVtb3ZlSWYoRnVuY3RvciYmIGZ1bmN0b3IpCitpbmxpbmUgYm9v bCBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjpyZW1vdmVJZihGdW5jdG9yJiYgZnVuY3RvcikKIHsK LSAgICBtX2ltcGwucmVtb3ZlSWYoc3RkOjpmb3J3YXJkPEZ1bmN0b3I+KGZ1bmN0b3IpKTsKKyAg ICByZXR1cm4gbV9pbXBsLnJlbW92ZUlmKHN0ZDo6Zm9yd2FyZDxGdW5jdG9yPihmdW5jdG9yKSk7 CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFUsIHR5cGVuYW1lIFYsIHR5cGVu YW1lIFcsIHR5cGVuYW1lIFg+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9IYXNoU2V0Lmgg Yi9Tb3VyY2UvV1RGL3d0Zi9IYXNoU2V0LmgKaW5kZXggZTYyYjNkOTIwMWM1ODQzZGNjMTBhNWY2 YzA1MmZhMGFhNmRmZDQ1Ni4uZmM0NTgzNWJkMTNiOGI2MDIzNzIxMjIxYjJjNTkyNDJkMjU0ZjM1 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvSGFzaFNldC5oCisrKyBiL1NvdXJjZS9XVEYv d3RmL0hhc2hTZXQuaApAQCAtMTA1LDcgKzEwNSw3IEBAIGNsYXNzIEhhc2hTZXQgZmluYWwgewog ICAgIGJvb2wgcmVtb3ZlKGNvbnN0IFZhbHVlVHlwZSYpOwogICAgIGJvb2wgcmVtb3ZlKGl0ZXJh dG9yKTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgotICAgIHZvaWQgcmVtb3ZlSWYo Y29uc3QgRnVuY3RvciYpOworICAgIGJvb2wgcmVtb3ZlSWYoY29uc3QgRnVuY3RvciYpOwogICAg IHZvaWQgY2xlYXIoKTsKIAogICAgIFRha2VUeXBlIHRha2UoY29uc3QgVmFsdWVUeXBlJik7CkBA IC0yNzUsOSArMjc1LDkgQEAgaW5saW5lIGJvb2wgSGFzaFNldDxULCBVLCBWPjo6cmVtb3ZlKGNv bnN0IFZhbHVlVHlwZSYgdmFsdWUpCiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFUs IHR5cGVuYW1lIFY+CiB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgotaW5saW5lIHZvaWQgSGFz aFNldDxULCBVLCBWPjo6cmVtb3ZlSWYoY29uc3QgRnVuY3RvciYgZnVuY3RvcikKK2lubGluZSBi b29sIEhhc2hTZXQ8VCwgVSwgVj46OnJlbW92ZUlmKGNvbnN0IEZ1bmN0b3ImIGZ1bmN0b3IpCiB7 Ci0gICAgbV9pbXBsLnJlbW92ZUlmKGZ1bmN0b3IpOworICAgIHJldHVybiBtX2ltcGwucmVtb3Zl SWYoZnVuY3Rvcik7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFUsIHR5cGVu YW1lIFY+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9IYXNoVGFibGUuaCBiL1NvdXJjZS9X VEYvd3RmL0hhc2hUYWJsZS5oCmluZGV4IDdmNGZhOWZiMzAxYzhjNWFhNjQwMDZmZDEwYjdmODE2 NGJkMmE5ZDYuLmQxZWViZDZmZmE1YzQxNGRhYTE0MDE4OWQ5Y2NkODA4ODI3N2FjOWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0hhc2hUYWJsZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0hh c2hUYWJsZS5oCkBAIC00MDUsNyArNDA1LDcgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIHZv aWQgcmVtb3ZlV2l0aG91dEVudHJ5Q29uc2lzdGVuY3lDaGVjayhpdGVyYXRvcik7CiAgICAgICAg IHZvaWQgcmVtb3ZlV2l0aG91dEVudHJ5Q29uc2lzdGVuY3lDaGVjayhjb25zdF9pdGVyYXRvcik7 CiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIEZ1bmN0b3I+Ci0gICAgICAgIHZvaWQgcmVtb3Zl SWYoY29uc3QgRnVuY3RvciYpOworICAgICAgICBib29sIHJlbW92ZUlmKGNvbnN0IEZ1bmN0b3Im KTsKICAgICAgICAgdm9pZCBjbGVhcigpOwogCiAgICAgICAgIHN0YXRpYyBib29sIGlzRW1wdHlC dWNrZXQoY29uc3QgVmFsdWVUeXBlJiB2YWx1ZSkgeyByZXR1cm4gaXNIYXNoVHJhaXRzRW1wdHlW YWx1ZTxLZXlUcmFpdHM+KEV4dHJhY3Rvcjo6ZXh0cmFjdCh2YWx1ZSkpOyB9CkBAIC0xMTA4LDcg KzExMDgsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEtleSwg dHlwZW5hbWUgVmFsdWUsIHR5cGVuYW1lIEV4dHJhY3RvciwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9u cywgdHlwZW5hbWUgVHJhaXRzLCB0eXBlbmFtZSBLZXlUcmFpdHM+CiAgICAgdGVtcGxhdGU8dHlw ZW5hbWUgRnVuY3Rvcj4KLSAgICBpbmxpbmUgdm9pZCBIYXNoVGFibGU8S2V5LCBWYWx1ZSwgRXh0 cmFjdG9yLCBIYXNoRnVuY3Rpb25zLCBUcmFpdHMsIEtleVRyYWl0cz46OnJlbW92ZUlmKGNvbnN0 IEZ1bmN0b3ImIGZ1bmN0b3IpCisgICAgaW5saW5lIGJvb2wgSGFzaFRhYmxlPEtleSwgVmFsdWUs IEV4dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+OjpyZW1vdmVJZihj b25zdCBGdW5jdG9yJiBmdW5jdG9yKQogICAgIHsKICAgICAgICAgLy8gV2UgbXVzdCB1c2UgbG9j YWwgY29waWVzIGluIGNhc2UgImZ1bmN0b3IiIG9yICJkZWxldGVCdWNrZXQiCiAgICAgICAgIC8v IG1ha2UgYSBmdW5jdGlvbiBjYWxsLCB3aGljaCBwcmV2ZW50cyB0aGUgY29tcGlsZXIgZnJvbSBr ZWVwaW5nCkBAIC0xMTM0LDYgKzExMzQsNyBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgICAg IHNocmluaygpOwogICAgICAgICAKICAgICAgICAgaW50ZXJuYWxDaGVja1RhYmxlQ29uc2lzdGVu Y3koKTsKKyAgICAgICAgcmV0dXJuIHJlbW92ZWRCdWNrZXRDb3VudDsKICAgICB9CiAKICAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBLZXksIHR5cGVuYW1lIFZhbHVlLCB0eXBlbmFtZSBFeHRyYWN0b3Is IHR5cGVuYW1lIEhhc2hGdW5jdGlvbnMsIHR5cGVuYW1lIFRyYWl0cywgdHlwZW5hbWUgS2V5VHJh aXRzPgo= 328051 2017-11-30 16:22:55 -0800 2017-11-30 17:02:51 -0800 Patch bug-180208-20171201092254.patch text/plain 8109 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy Zjk0ZjFlZGFmMTFkZTQxZWY0ZjU0Y2IzMTEyZjA5ODhmZTNiYjg1Li5kZGU3NzUyMDdmYzE3YzM0 OGU2ZTNkYTUyNmEzNWM4NDg3MTMxNGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNy0xMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBSZW1vdmUgZWFzeSB0b1JlbW92ZSAmIG1hcC5yZW1vdmUo KSB1c2UgaW4gT0FTIHBoYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODAyMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbiB0aGlzIHBhdGNoLCB3ZSByZXBsYWNlIFZlY3Rvcjw+IHRvUmVtb3ZlICYg bWFwLnJlbW92ZSBsb29wIHdpdGggcmVtb3ZlSWYsCisgICAgICAgIHRvIG9wdGltaXplIHRoaXMg Y29tbW9uIHBhdHRlcm4uIFRoaXMgcGF0Y2ggb25seSBtb2RpZmllcyBhcHBhcmVudCBvbmVzLgor ICAgICAgICBCdXQgd2UgY2FuIGFwcGx5IHRoaXMgcmVmYWN0b3JpbmcgZnVydGhlciB0byBPQVMg cGhhc2UgaW4gdGhlIGZ1dHVyZS4KKworICAgICAgICBPbmUgdGhpbmcgd2Ugc2hvdWxkIGNhcmUg aXMgdGhhdCBwcmVkaWNhdGUgb2YgcmVtb3ZlSWYgc2hvdWxkIG5vdCB0b3VjaCB0aGUKKyAgICAg ICAgcmVtb3Zpbmcgc2V0IGl0c2VsZi4gSW4gdGhpcyBwYXRjaCwgd2UgYXBwbHkgdGhpcyBjaGFu Z2UgdG8gKDEpIGFwcGFyZW50bHkKKyAgICAgICAgY29ycmVjdCBvbmUgYW5kICgyKSB0aGluZ3Mg aW4gREZHIE9BUyBwaGFzZSBzaW5jZSBpdCBpcyB2ZXJ5IHNsb3cuCisKKyAgICAgICAgKiBiMy9C M01vdmVDb25zdGFudHMuY3BwOgorICAgICAgICAqIGRmZy9ERkdPYmplY3RBbGxvY2F0aW9uU2lu a2luZ1BoYXNlLmNwcDoKKwogMjAxNy0xMS0zMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVl QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyNTM2Mi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYmM0ZTU1ZTFlODdiYTJlMjgxMDAwZGExZTdiMTAwZDlmM2FkNDFlOS4uOWMzZWYzODE2 MjgxM2VlN2E1YmI1YjlkNGUzYWNlYjQ1MzQ4YzBiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx Ny0xMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KKworICAgICAg ICBbSlNDXSBSZW1vdmUgZWFzeSB0b1JlbW92ZSAmIG1hcC5yZW1vdmUoKSB1c2UgaW4gT0FTIHBo YXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAy MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0 Zi9IYXNoTWFwLmg6CisgICAgICAgIChXVEY6Olg+OjpyZW1vdmVJZik6CisgICAgICAgICogd3Rm L0hhc2hTZXQuaDoKKyAgICAgICAgKFdURjo6Vj46OnJlbW92ZUlmKToKKyAgICAgICAgKiB3dGYv SGFzaFRhYmxlLmg6CisgICAgICAgIChXVEY6OktleVRyYWl0cz46OnJlbW92ZUlmKToKKwogMjAx Ny0xMS0zMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyNTM2Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9iMy9CM01vdmVDb25zdGFudHMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2IzL0IzTW92ZUNvbnN0YW50cy5jcHAKaW5kZXggZDNlZDk3OWI5NTZiMTVhZTE5ODc4ZjNk NGY4ZjA5YTA4MTg5NGI5My4uYzk4MTcyYmQ3ZDZiNmY2NzU1NzY5NjU4ZWJhOTg4ZDVjYzg1NTMw YiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzTW92ZUNvbnN0YW50cy5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzTW92ZUNvbnN0YW50cy5jcHAKQEAg LTM0MiwxMCArMzQyLDggQEAgY2xhc3MgTW92ZUNvbnN0YW50cyB7CiAgICAgfQogCiAgICAgUHJv Y2VkdXJlJiBtX3Byb2M7Ci0gICAgVmVjdG9yPFZhbHVlKj4gbV90b1JlbW92ZTsKICAgICBIYXNo TWFwPFZhbHVlS2V5LCB1bnNpZ25lZD4gbV9jb25zdFRhYmxlOwogICAgIGludDY0X3QqIG1fZGF0 YVNlY3Rpb247Ci0gICAgSGFzaE1hcDxWYWx1ZUtleSwgVmFsdWUqPiBtX2NvbnN0YW50czsKICAg ICBJbnNlcnRpb25TZXQgbV9pbnNlcnRpb25TZXQ7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR09iamVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPYmplY3RBbGxvY2F0aW9uU2lua2luZ1BoYXNl LmNwcAppbmRleCAzZmRhN2Q0MGIwODZiZDE5YzNjMjhiMGE2MGRhZDE1NzVlZjYwYzM3Li44MTcx YjZlY2Q2NTg1M2I5YjI1NmQ4MjM1ZWQ1YWQ0YjVmM2E2ODU1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR09iamVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UuY3BwCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQ aGFzZS5jcHAKQEAgLTUwNywxNCArNTA3LDEwIEBAIGNsYXNzIExvY2FsSGVhcCB7CiAKICAgICB2 b2lkIHBydW5lQnlMaXZlbmVzcyhjb25zdCBOb2RlU2V0JiBsaXZlKQogICAgIHsKLSAgICAgICAg VmVjdG9yPE5vZGUqPiB0b1JlbW92ZTsKLSAgICAgICAgZm9yIChjb25zdCBhdXRvJiBlbnRyeSA6 IG1fcG9pbnRlcnMpIHsKLSAgICAgICAgICAgIGlmICghbGl2ZS5jb250YWlucyhlbnRyeS5rZXkp KQotICAgICAgICAgICAgICAgIHRvUmVtb3ZlLmFwcGVuZChlbnRyeS5rZXkpOwotICAgICAgICB9 Ci0gICAgICAgIGZvciAoTm9kZSogbm9kZSA6IHRvUmVtb3ZlKQotICAgICAgICAgICAgbV9wb2lu dGVycy5yZW1vdmUobm9kZSk7Ci0KKyAgICAgICAgbV9wb2ludGVycy5yZW1vdmVJZigKKyAgICAg ICAgICAgIFsmXSAoY29uc3QgYXV0byYgZW50cnkpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4g IWxpdmUuY29udGFpbnMoZW50cnkua2V5KTsKKyAgICAgICAgICAgIH0pOwogICAgICAgICBwcnVu ZSgpOwogICAgIH0KIApAQCAtNjgyLDE1ICs2NzgsMTAgQEAgY2xhc3MgTG9jYWxIZWFwIHsKICAg ICAgICAgfQogCiAgICAgICAgIC8vIFJlbW92ZSB1bnJlYWNoYWJsZSBhbGxvY2F0aW9ucwotICAg ICAgICB7Ci0gICAgICAgICAgICBWZWN0b3I8Tm9kZSo+IHRvUmVtb3ZlOwotICAgICAgICAgICAg Zm9yIChjb25zdCBhdXRvJiBlbnRyeSA6IG1fYWxsb2NhdGlvbnMpIHsKLSAgICAgICAgICAgICAg ICBpZiAoIXJlYWNoYWJsZS5jb250YWlucyhlbnRyeS5rZXkpKQotICAgICAgICAgICAgICAgICAg ICB0b1JlbW92ZS5hcHBlbmQoZW50cnkua2V5KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IGZvciAoTm9kZSogaWRlbnRpZmllciA6IHRvUmVtb3ZlKQotICAgICAgICAgICAgICAgIG1fYWxs b2NhdGlvbnMucmVtb3ZlKGlkZW50aWZpZXIpOwotICAgICAgICB9CisgICAgICAgIG1fYWxsb2Nh dGlvbnMucmVtb3ZlSWYoCisgICAgICAgICAgICBbJl0gKGNvbnN0IGF1dG8mIGVudHJ5KSB7Cisg ICAgICAgICAgICAgICAgcmV0dXJuICFyZWFjaGFibGUuY29udGFpbnMoZW50cnkua2V5KTsKKyAg ICAgICAgICAgIH0pOwogICAgIH0KIAogICAgIGJvb2wgbV9yZWFjaGVkID0gZmFsc2U7CkBAIC0x MjQ5LDE0ICsxMjQwLDEwIEBAIGNsYXNzIE9iamVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UgOiBw dWJsaWMgUGhhc2UgewogICAgIHsKICAgICAgICAgLy8gV2UgZG9uJ3QgY3JlYXRlIG1hdGVyaWFs aXphdGlvbnMgaWYgdGhlIGVzY2FwZWUgaXMgbm90IGEKICAgICAgICAgLy8gc2luayBjYW5kaWRh dGUKLSAgICAgICAgVmVjdG9yPE5vZGUqPiB0b1JlbW92ZTsKLSAgICAgICAgZm9yIChjb25zdCBh dXRvJiBlbnRyeSA6IGVzY2FwZWVzKSB7Ci0gICAgICAgICAgICBpZiAoIW1fc2lua0NhbmRpZGF0 ZXMuY29udGFpbnMoZW50cnkua2V5KSkKLSAgICAgICAgICAgICAgICB0b1JlbW92ZS5hcHBlbmQo ZW50cnkua2V5KTsKLSAgICAgICAgfQotICAgICAgICBmb3IgKE5vZGUqIGlkZW50aWZpZXIgOiB0 b1JlbW92ZSkKLSAgICAgICAgICAgIGVzY2FwZWVzLnJlbW92ZShpZGVudGlmaWVyKTsKLQorICAg ICAgICBlc2NhcGVlcy5yZW1vdmVJZigKKyAgICAgICAgICAgIFsmXSAoY29uc3QgYXV0byYgZW50 cnkpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gIW1fc2lua0NhbmRpZGF0ZXMuY29udGFpbnMo ZW50cnkua2V5KTsKKyAgICAgICAgICAgIH0pOwogICAgICAgICBpZiAoZXNjYXBlZXMuaXNFbXB0 eSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9I YXNoTWFwLmggYi9Tb3VyY2UvV1RGL3d0Zi9IYXNoTWFwLmgKaW5kZXggZTRjZjZiYWZlYTVkNTQx YzZjODc0OWRlZDg0MDIyYTdhNDBlMTJkMi4uMzRlNzJmZjBmMTg1Njc5Y2QzOGJmNjc1YWViM2Yy YjcwOWE2NDkyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvSGFzaE1hcC5oCisrKyBiL1Nv dXJjZS9XVEYvd3RmL0hhc2hNYXAuaApAQCAtMTM1LDcgKzEzNSw3IEBAIGNsYXNzIEhhc2hNYXAg ZmluYWwgewogICAgIGJvb2wgcmVtb3ZlKGNvbnN0IEtleVR5cGUmKTsKICAgICBib29sIHJlbW92 ZShpdGVyYXRvcik7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgRnVuY3Rvcj4KLSAgICB2b2lkIHJl bW92ZUlmKEZ1bmN0b3ImJik7CisgICAgYm9vbCByZW1vdmVJZihGdW5jdG9yJiYpOwogICAgIHZv aWQgY2xlYXIoKTsKIAogICAgIE1hcHBlZFRha2VUeXBlIHRha2UoY29uc3QgS2V5VHlwZSYpOyAv LyBlZmZpY2llbnQgY29tYmluYXRpb24gb2YgZ2V0IHdpdGggcmVtb3ZlCkBAIC00NDMsOSArNDQz LDkgQEAgaW5saW5lIGJvb2wgSGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6cmVtb3ZlKGl0ZXJhdG9y IGl0KQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVLCB0eXBlbmFtZSBWLCB0eXBl bmFtZSBXLCB0eXBlbmFtZSBYPgogdGVtcGxhdGU8dHlwZW5hbWUgRnVuY3Rvcj4KLWlubGluZSB2 b2lkIEhhc2hNYXA8VCwgVSwgViwgVywgWD46OnJlbW92ZUlmKEZ1bmN0b3ImJiBmdW5jdG9yKQor aW5saW5lIGJvb2wgSGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6cmVtb3ZlSWYoRnVuY3RvciYmIGZ1 bmN0b3IpCiB7Ci0gICAgbV9pbXBsLnJlbW92ZUlmKHN0ZDo6Zm9yd2FyZDxGdW5jdG9yPihmdW5j dG9yKSk7CisgICAgcmV0dXJuIG1faW1wbC5yZW1vdmVJZihzdGQ6OmZvcndhcmQ8RnVuY3Rvcj4o ZnVuY3RvcikpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVLCB0eXBlbmFt ZSBWLCB0eXBlbmFtZSBXLCB0eXBlbmFtZSBYPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv SGFzaFNldC5oIGIvU291cmNlL1dURi93dGYvSGFzaFNldC5oCmluZGV4IGU2MmIzZDkyMDFjNTg0 M2RjYzEwYTVmNmMwNTJmYTBhYTZkZmQ0NTYuLmZjNDU4MzViZDEzYjhiNjAyMzcyMTIyMWIyYzU5 MjQyZDI1NGYzNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0hhc2hTZXQuaAorKysgYi9T b3VyY2UvV1RGL3d0Zi9IYXNoU2V0LmgKQEAgLTEwNSw3ICsxMDUsNyBAQCBjbGFzcyBIYXNoU2V0 IGZpbmFsIHsKICAgICBib29sIHJlbW92ZShjb25zdCBWYWx1ZVR5cGUmKTsKICAgICBib29sIHJl bW92ZShpdGVyYXRvcik7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgRnVuY3Rvcj4KLSAgICB2b2lk IHJlbW92ZUlmKGNvbnN0IEZ1bmN0b3ImKTsKKyAgICBib29sIHJlbW92ZUlmKGNvbnN0IEZ1bmN0 b3ImKTsKICAgICB2b2lkIGNsZWFyKCk7CiAKICAgICBUYWtlVHlwZSB0YWtlKGNvbnN0IFZhbHVl VHlwZSYpOwpAQCAtMjc1LDkgKzI3NSw5IEBAIGlubGluZSBib29sIEhhc2hTZXQ8VCwgVSwgVj46 OnJlbW92ZShjb25zdCBWYWx1ZVR5cGUmIHZhbHVlKQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0 eXBlbmFtZSBVLCB0eXBlbmFtZSBWPgogdGVtcGxhdGU8dHlwZW5hbWUgRnVuY3Rvcj4KLWlubGlu ZSB2b2lkIEhhc2hTZXQ8VCwgVSwgVj46OnJlbW92ZUlmKGNvbnN0IEZ1bmN0b3ImIGZ1bmN0b3Ip CitpbmxpbmUgYm9vbCBIYXNoU2V0PFQsIFUsIFY+OjpyZW1vdmVJZihjb25zdCBGdW5jdG9yJiBm dW5jdG9yKQogewotICAgIG1faW1wbC5yZW1vdmVJZihmdW5jdG9yKTsKKyAgICByZXR1cm4gbV9p bXBsLnJlbW92ZUlmKGZ1bmN0b3IpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFt ZSBVLCB0eXBlbmFtZSBWPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvSGFzaFRhYmxlLmgg Yi9Tb3VyY2UvV1RGL3d0Zi9IYXNoVGFibGUuaAppbmRleCA3ZjRmYTlmYjMwMWM4YzVhYTY0MDA2 ZmQxMGI3ZjgxNjRiZDJhOWQ2Li5kMWVlYmQ2ZmZhNWM0MTRkYWExNDAxODlkOWNjZDgwODgyNzdh YzljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9IYXNoVGFibGUuaAorKysgYi9Tb3VyY2Uv V1RGL3d0Zi9IYXNoVGFibGUuaApAQCAtNDA1LDcgKzQwNSw3IEBAIG5hbWVzcGFjZSBXVEYgewog ICAgICAgICB2b2lkIHJlbW92ZVdpdGhvdXRFbnRyeUNvbnNpc3RlbmN5Q2hlY2soaXRlcmF0b3Ip OwogICAgICAgICB2b2lkIHJlbW92ZVdpdGhvdXRFbnRyeUNvbnNpc3RlbmN5Q2hlY2soY29uc3Rf aXRlcmF0b3IpOwogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgotICAgICAgICB2 b2lkIHJlbW92ZUlmKGNvbnN0IEZ1bmN0b3ImKTsKKyAgICAgICAgYm9vbCByZW1vdmVJZihjb25z dCBGdW5jdG9yJik7CiAgICAgICAgIHZvaWQgY2xlYXIoKTsKIAogICAgICAgICBzdGF0aWMgYm9v bCBpc0VtcHR5QnVja2V0KGNvbnN0IFZhbHVlVHlwZSYgdmFsdWUpIHsgcmV0dXJuIGlzSGFzaFRy YWl0c0VtcHR5VmFsdWU8S2V5VHJhaXRzPihFeHRyYWN0b3I6OmV4dHJhY3QodmFsdWUpKTsgfQpA QCAtMTEwOCw3ICsxMTA4LDcgQEAgbmFtZXNwYWNlIFdURiB7CiAKICAgICB0ZW1wbGF0ZTx0eXBl bmFtZSBLZXksIHR5cGVuYW1lIFZhbHVlLCB0eXBlbmFtZSBFeHRyYWN0b3IsIHR5cGVuYW1lIEhh c2hGdW5jdGlvbnMsIHR5cGVuYW1lIFRyYWl0cywgdHlwZW5hbWUgS2V5VHJhaXRzPgogICAgIHRl bXBsYXRlPHR5cGVuYW1lIEZ1bmN0b3I+Ci0gICAgaW5saW5lIHZvaWQgSGFzaFRhYmxlPEtleSwg VmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+OjpyZW1v dmVJZihjb25zdCBGdW5jdG9yJiBmdW5jdG9yKQorICAgIGlubGluZSBib29sIEhhc2hUYWJsZTxL ZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6 cmVtb3ZlSWYoY29uc3QgRnVuY3RvciYgZnVuY3RvcikKICAgICB7CiAgICAgICAgIC8vIFdlIG11 c3QgdXNlIGxvY2FsIGNvcGllcyBpbiBjYXNlICJmdW5jdG9yIiBvciAiZGVsZXRlQnVja2V0Igog ICAgICAgICAvLyBtYWtlIGEgZnVuY3Rpb24gY2FsbCwgd2hpY2ggcHJldmVudHMgdGhlIGNvbXBp bGVyIGZyb20ga2VlcGluZwpAQCAtMTEzNCw2ICsxMTM0LDcgQEAgbmFtZXNwYWNlIFdURiB7CiAg ICAgICAgICAgICBzaHJpbmsoKTsKICAgICAgICAgCiAgICAgICAgIGludGVybmFsQ2hlY2tUYWJs ZUNvbnNpc3RlbmN5KCk7CisgICAgICAgIHJldHVybiByZW1vdmVkQnVja2V0Q291bnQ7CiAgICAg fQogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5LCB0eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUg RXh0cmFjdG9yLCB0eXBlbmFtZSBIYXNoRnVuY3Rpb25zLCB0eXBlbmFtZSBUcmFpdHMsIHR5cGVu YW1lIEtleVRyYWl0cz4K