234117 2021-12-09 18:06:51 -0800 Use simpler idioms for std::less and std::greater possible in modern C++ 2021-12-10 10:19:20 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build All All RESOLVED FIXED InRadar P3 Normal --- 1 darin darin andersca benjamin cdumez cmarcelo ews-watchlist thorton webkit-bug-importer oldest_to_newest 1822468 0 darin 2021-12-09 18:06:51 -0800 Use simpler idioms for std::less and std::greater possible in modern C++ 1822472 1 446649 darin 2021-12-09 18:09:21 -0800 Created attachment 446649 Patch 1822494 2 446657 darin 2021-12-09 20:26:39 -0800 Created attachment 446657 Patch 1822776 3 446657 andersca 2021-12-10 10:07:35 -0800 Comment on attachment 446657 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446657&action=review > Source/WTF/wtf/ListDump.h:124 > + return sortedListDump(list, std::less<>(), comma); Is there a reason why std::less() does not work here? Maybe because it's in an uninstantiated context? 1822779 4 446657 darin 2021-12-10 10:13:32 -0800 Comment on attachment 446657 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446657&action=review >> Source/WTF/wtf/ListDump.h:124 >> + return sortedListDump(list, std::less<>(), comma); > > Is there a reason why std::less() does not work here? Maybe because it's in an uninstantiated context? I know it doesn’t because my earlier patch failed to compile (gcc), but it did seem to compile locally (clang), so it might be a workaround for a gcc bug. I suspect it has something to do with the fact that the comparator argument to sortedListDump is "const Comparator&" and the comparator argument to sort is "Comparator", but the fact that it does seem to work in clang confuses me a bit. 1822783 5 darin 2021-12-10 10:18:14 -0800 Committed r286858 (?): <https://commits.webkit.org/r286858> 1822785 6 webkit-bug-importer 2021-12-10 10:19:20 -0800 <rdar://problem/86328234> 446649 2021-12-09 18:09:21 -0800 2021-12-09 20:26:36 -0800 Patch bug-234117-20211209180920.patch text/plain 4499 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE1MjQ2MjFiM2E4ZWQ0ODUwN2MzNTg2 OGNkNjVhMGJhYzk0ZGNlYTAuLjM0MmRmNTlhODc4NzYyNTA3ODlhMGZkNTA2NzcxYWY1MDVjYTk5 M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTItMDkgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFVzZSBzaW1wbGVyIGlkaW9tcyBmb3Igc3RkOjpsZXNzIGFu ZCBzdGQ6OmdyZWF0ZXIgcG9zc2libGUgaW4gbW9kZXJuIEMrKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MTE3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvTGlzdER1bXAuaDoKKyAgICAgICAg KFdURjo6c29ydGVkTGlzdER1bXApOiBSZW1vdmVkIHVubmVjZXNzYXJ5IHRlbXBsYXRlIGFyZ3Vt ZW50cyB0byBzdGQ6Omxlc3MuCisKIDIwMjEtMTItMDkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBQcmVwYXJlIGZvciB0cmFuc2l0aW9uIHRv IEMrKzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggNTZhMTA3MDg0MjQ0NmNlNjYwOTY2YWQ1M2Y1YmM0YmJhOTY1 Zjk4MC4uOTAwYmY4MWRjNTlhYWI3YTAyOWIxYTNjM2U0YTlhNzJkOWZmY2U1MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEyLTA5ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KKworICAgICAgICBVc2Ugc2ltcGxlciBpZGlvbXMgZm9yIHN0ZDo6bGVzcyBhbmQgc3Rk OjpncmVhdGVyIHBvc3NpYmxlIGluIG1vZGVybiBDKysKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDExNworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHNNYXBMaWtlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsc01hcExpa2U6Omluc3BlY3RWYWx1ZXMgY29uc3Qp OiBSZW1vdmUgdW5uZWVkZWQgZXhwbGljaXQKKyAgICAgICAgdXNlIG9mIHN0ZDpsZXNzLCBiZWNh dXNlIHRoaXMgaXMgd2hhdCBzdGQ6OnNvcnQgYnkgZGVmYXVsdC4KKwogMjAyMS0xMi0wOSAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByZXBh cmUgZm9yIHRyYW5zaXRpb24gdG8gQysrMjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYzk1MDBkMWUyNzE5ZGVjNzcy NWM4Yjk3MWFiYzJjZjEwZjkyNzg0YS4uYjgxZjRjNGFhOWQxOTkxNjkxMjkyMDNjZTQxMTg0NmY3 ZWQyOGQ1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0xMi0wOSAgRGFyaW4gQWRs ZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHNpbXBsZXIgaWRpb21zIGZvciBz dGQ6Omxlc3MgYW5kIHN0ZDo6Z3JlYXRlciBwb3NzaWJsZSBpbiBtb2Rlcm4gQysrCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQxMTcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9Nb21lbnR1bUV2ZW50RGlzcGF0Y2hlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok1vbWVu dHVtRXZlbnREaXNwYXRjaGVyOjplcXVhbGl6ZVRhaWxHYXBzKTogUmVtb3ZlZCB1bm5lZWRlZAor ICAgICAgICB0ZW1wbGF0ZSBhcmd1bWVudHMgZm9yIHN0ZDo6Z3JlYXRlciwgYW5kIHJlbW92ZWQg ZXhwbGljaXQgdXNlIG9mIHN0ZDo6bGVzcywKKyAgICAgICAgc2luY2UgdGhhdCdzIHdoYXQgc3Rk Ojpzb3J0IGRvZXMgYnkgZGVmYXVsdC4KKwogMjAyMS0xMi0wOSAgQWxleCBDaHJpc3RlbnNlbiAg PGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByZXBhcmUgZm9yIHRyYW5zaXRp b24gdG8gQysrMjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xpc3REdW1wLmggYi9Tb3Vy Y2UvV1RGL3d0Zi9MaXN0RHVtcC5oCmluZGV4IDM1NjEyYjQwYTUzZDE1ZTI2MDgyNDE5ODkxYzU0 OGM0MWQ2NTljNTUuLjE5ZGI1MDZkYzE5OWI2MWZmZTBhNmE3ZGUyZDhmMmFkYzc3Yzc1NzEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0xpc3REdW1wLmgKKysrIGIvU291cmNlL1dURi93dGYv TGlzdER1bXAuaApAQCAtMTIxLDcgKzEyMSw3IEBAIENTdHJpbmcgc29ydGVkTGlzdER1bXAoY29u c3QgVCYgbGlzdCwgY29uc3QgQ29tcGFyYXRvciYgY29tcGFyYXRvciwgY29uc3QgY2hhcioKIHRl bXBsYXRlPHR5cGVuYW1lIFQ+CiBDU3RyaW5nIHNvcnRlZExpc3REdW1wKGNvbnN0IFQmIGxpc3Qs IGNvbnN0IGNoYXIqIGNvbW1hID0gIiwgIikKIHsKLSAgICByZXR1cm4gc29ydGVkTGlzdER1bXAo bGlzdCwgc3RkOjpsZXNzPHR5cGVuYW1lIFQ6OlZhbHVlVHlwZT4oKSwgY29tbWEpOworICAgIHJl dHVybiBzb3J0ZWRMaXN0RHVtcChsaXN0LCBzdGQ6Omxlc3MoKSwgY29tbWEpOwogfQogCiB0ZW1w bGF0ZTx0eXBlbmFtZSBUPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRl cm5hbHNNYXBMaWtlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzTWFwTGlr ZS5jcHAKaW5kZXggNDNkZmVkNDI5ZGE3ZjUzMWNhMjQwODJiNTMwZDkwNjE0YTQ5OWE3Yy4uOWY3 NjgwYzU0NmUxNzhmM2QyZTMwYjBlNzY0NWE1ODBmZDY5OTZkYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHNNYXBMaWtlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFsc01hcExpa2UuY3BwCkBAIC02OCw3ICs2OCw3IEBAIFZlY3RvcjxT dHJpbmc+IEludGVybmFsc01hcExpa2U6Omluc3BlY3RLZXlzKCkgY29uc3QKIFZlY3Rvcjx1bnNp Z25lZD4gSW50ZXJuYWxzTWFwTGlrZTo6aW5zcGVjdFZhbHVlcygpIGNvbnN0CiB7CiAgICAgYXV0 byByZXN1bHQgPSBjb3B5VG9WZWN0b3IobV92YWx1ZXMudmFsdWVzKCkpOwotICAgIHN0ZDo6c29y dChyZXN1bHQuYmVnaW4oKSwgcmVzdWx0LmVuZCgpLCBzdGQ6Omxlc3M8dW5zaWduZWQ+KCkpOwor ICAgIHN0ZDo6c29ydChyZXN1bHQuYmVnaW4oKSwgcmVzdWx0LmVuZCgpKTsKICAgICByZXR1cm4g cmVzdWx0OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9Nb21lbnR1bUV2ZW50RGlzcGF0Y2hlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9Nb21lbnR1bUV2ZW50RGlzcGF0Y2hlci5jcHAKaW5kZXggOWMwZDA0MTllMDc1M2Yz MWE5OTFlZjNjZjc1NWY5ZDY1NzdlOGJjOC4uMjg5OTJlYmE4OGE4OWNiZWFkZTRjMzNhMGNlOTk2 YWI4NmI1OWNhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv TW9tZW50dW1FdmVudERpc3BhdGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL01vbWVudHVtRXZlbnREaXNwYXRjaGVyLmNwcApAQCAtNDM3LDkgKzQzNyw5IEBA IHZvaWQgTW9tZW50dW1FdmVudERpc3BhdGNoZXI6OmVxdWFsaXplVGFpbEdhcHMoKQogICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlmIChkZWx0YXNbYXhpc11bMF0gPiAwKQotICAgICAg ICAgICAgc3RkOjpzb3J0KGRlbHRhc1theGlzXS5iZWdpbigpLCBzdGQ6Om5leHQoZGVsdGFzW2F4 aXNdLmJlZ2luKCksIGZpcnN0WmVyb0luZGV4W2F4aXNdKSwgc3RkOjpncmVhdGVyPGZsb2F0Pigp KTsKKyAgICAgICAgICAgIHN0ZDo6c29ydChkZWx0YXNbYXhpc10uYmVnaW4oKSwgc3RkOjpuZXh0 KGRlbHRhc1theGlzXS5iZWdpbigpLCBmaXJzdFplcm9JbmRleFtheGlzXSksIHN0ZDo6Z3JlYXRl cigpKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgc3RkOjpzb3J0KGRlbHRhc1theGlzXS5i ZWdpbigpLCBzdGQ6Om5leHQoZGVsdGFzW2F4aXNdLmJlZ2luKCksIGZpcnN0WmVyb0luZGV4W2F4 aXNdKSwgc3RkOjpsZXNzPGZsb2F0PigpKTsKKyAgICAgICAgICAgIHN0ZDo6c29ydChkZWx0YXNb YXhpc10uYmVnaW4oKSwgc3RkOjpuZXh0KGRlbHRhc1theGlzXS5iZWdpbigpLCBmaXJzdFplcm9J bmRleFtheGlzXSkpOwogICAgIH07CiAKICAgICBzb3J0RGVsdGFzKEhvcml6b250YWwpOwo= 446657 2021-12-09 20:26:39 -0800 2021-12-10 10:07:35 -0800 Patch bug-234117-20211209202638.patch text/plain 4501 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE1MjQ2MjFiM2E4ZWQ0ODUwN2MzNTg2 OGNkNjVhMGJhYzk0ZGNlYTAuLjM0MmRmNTlhODc4NzYyNTA3ODlhMGZkNTA2NzcxYWY1MDVjYTk5 M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTItMDkgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFVzZSBzaW1wbGVyIGlkaW9tcyBmb3Igc3RkOjpsZXNzIGFu ZCBzdGQ6OmdyZWF0ZXIgcG9zc2libGUgaW4gbW9kZXJuIEMrKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MTE3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvTGlzdER1bXAuaDoKKyAgICAgICAg KFdURjo6c29ydGVkTGlzdER1bXApOiBSZW1vdmVkIHVubmVjZXNzYXJ5IHRlbXBsYXRlIGFyZ3Vt ZW50cyB0byBzdGQ6Omxlc3MuCisKIDIwMjEtMTItMDkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBQcmVwYXJlIGZvciB0cmFuc2l0aW9uIHRv IEMrKzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggNTZhMTA3MDg0MjQ0NmNlNjYwOTY2YWQ1M2Y1YmM0YmJhOTY1 Zjk4MC4uOTAwYmY4MWRjNTlhYWI3YTAyOWIxYTNjM2U0YTlhNzJkOWZmY2U1MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEyLTA5ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KKworICAgICAgICBVc2Ugc2ltcGxlciBpZGlvbXMgZm9yIHN0ZDo6bGVzcyBhbmQgc3Rk OjpncmVhdGVyIHBvc3NpYmxlIGluIG1vZGVybiBDKysKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDExNworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHNNYXBMaWtlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsc01hcExpa2U6Omluc3BlY3RWYWx1ZXMgY29uc3Qp OiBSZW1vdmUgdW5uZWVkZWQgZXhwbGljaXQKKyAgICAgICAgdXNlIG9mIHN0ZDpsZXNzLCBiZWNh dXNlIHRoaXMgaXMgd2hhdCBzdGQ6OnNvcnQgYnkgZGVmYXVsdC4KKwogMjAyMS0xMi0wOSAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByZXBh cmUgZm9yIHRyYW5zaXRpb24gdG8gQysrMjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYzk1MDBkMWUyNzE5ZGVjNzcy NWM4Yjk3MWFiYzJjZjEwZjkyNzg0YS4uYjgxZjRjNGFhOWQxOTkxNjkxMjkyMDNjZTQxMTg0NmY3 ZWQyOGQ1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0xMi0wOSAgRGFyaW4gQWRs ZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHNpbXBsZXIgaWRpb21zIGZvciBz dGQ6Omxlc3MgYW5kIHN0ZDo6Z3JlYXRlciBwb3NzaWJsZSBpbiBtb2Rlcm4gQysrCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQxMTcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9Nb21lbnR1bUV2ZW50RGlzcGF0Y2hlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok1vbWVu dHVtRXZlbnREaXNwYXRjaGVyOjplcXVhbGl6ZVRhaWxHYXBzKTogUmVtb3ZlZCB1bm5lZWRlZAor ICAgICAgICB0ZW1wbGF0ZSBhcmd1bWVudHMgZm9yIHN0ZDo6Z3JlYXRlciwgYW5kIHJlbW92ZWQg ZXhwbGljaXQgdXNlIG9mIHN0ZDo6bGVzcywKKyAgICAgICAgc2luY2UgdGhhdCdzIHdoYXQgc3Rk Ojpzb3J0IGRvZXMgYnkgZGVmYXVsdC4KKwogMjAyMS0xMi0wOSAgQWxleCBDaHJpc3RlbnNlbiAg PGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByZXBhcmUgZm9yIHRyYW5zaXRp b24gdG8gQysrMjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xpc3REdW1wLmggYi9Tb3Vy Y2UvV1RGL3d0Zi9MaXN0RHVtcC5oCmluZGV4IDM1NjEyYjQwYTUzZDE1ZTI2MDgyNDE5ODkxYzU0 OGM0MWQ2NTljNTUuLjY1ODk0YTdiMDg2NjNmNWNkYWZmN2Y0M2UwMTdmYWI3OTlkZjQ4ZmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0xpc3REdW1wLmgKKysrIGIvU291cmNlL1dURi93dGYv TGlzdER1bXAuaApAQCAtMTIxLDcgKzEyMSw3IEBAIENTdHJpbmcgc29ydGVkTGlzdER1bXAoY29u c3QgVCYgbGlzdCwgY29uc3QgQ29tcGFyYXRvciYgY29tcGFyYXRvciwgY29uc3QgY2hhcioKIHRl bXBsYXRlPHR5cGVuYW1lIFQ+CiBDU3RyaW5nIHNvcnRlZExpc3REdW1wKGNvbnN0IFQmIGxpc3Qs IGNvbnN0IGNoYXIqIGNvbW1hID0gIiwgIikKIHsKLSAgICByZXR1cm4gc29ydGVkTGlzdER1bXAo bGlzdCwgc3RkOjpsZXNzPHR5cGVuYW1lIFQ6OlZhbHVlVHlwZT4oKSwgY29tbWEpOworICAgIHJl dHVybiBzb3J0ZWRMaXN0RHVtcChsaXN0LCBzdGQ6Omxlc3M8PigpLCBjb21tYSk7CiB9CiAKIHRl bXBsYXRlPHR5cGVuYW1lIFQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0lu dGVybmFsc01hcExpa2UuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHNNYXBM aWtlLmNwcAppbmRleCA0M2RmZWQ0MjlkYTdmNTMxY2EyNDA4MmI1MzBkOTA2MTRhNDk5YTdjLi45 Zjc2ODBjNTQ2ZTE3OGYzZDJlMzBiMGU3NjQ1YTU4MGZkNjk5NmRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsc01hcExpa2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3Rlc3RpbmcvSW50ZXJuYWxzTWFwTGlrZS5jcHAKQEAgLTY4LDcgKzY4LDcgQEAgVmVjdG9y PFN0cmluZz4gSW50ZXJuYWxzTWFwTGlrZTo6aW5zcGVjdEtleXMoKSBjb25zdAogVmVjdG9yPHVu c2lnbmVkPiBJbnRlcm5hbHNNYXBMaWtlOjppbnNwZWN0VmFsdWVzKCkgY29uc3QKIHsKICAgICBh dXRvIHJlc3VsdCA9IGNvcHlUb1ZlY3RvcihtX3ZhbHVlcy52YWx1ZXMoKSk7Ci0gICAgc3RkOjpz b3J0KHJlc3VsdC5iZWdpbigpLCByZXN1bHQuZW5kKCksIHN0ZDo6bGVzczx1bnNpZ25lZD4oKSk7 CisgICAgc3RkOjpzb3J0KHJlc3VsdC5iZWdpbigpLCByZXN1bHQuZW5kKCkpOwogICAgIHJldHVy biByZXN1bHQ7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL01vbWVudHVtRXZlbnREaXNwYXRjaGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL01vbWVudHVtRXZlbnREaXNwYXRjaGVyLmNwcAppbmRleCA5YzBkMDQxOWUwNzUz ZjMxYTk5MWVmM2NmNzU1ZjlkNjU3N2U4YmM4Li4yODk5MmViYTg4YTg5Y2JlYWRlNGMzM2EwY2U5 OTZhYjg2YjU5Y2E1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9Nb21lbnR1bUV2ZW50RGlzcGF0Y2hlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvTW9tZW50dW1FdmVudERpc3BhdGNoZXIuY3BwCkBAIC00MzcsOSArNDM3LDkg QEAgdm9pZCBNb21lbnR1bUV2ZW50RGlzcGF0Y2hlcjo6ZXF1YWxpemVUYWlsR2FwcygpCiAgICAg ICAgICAgICByZXR1cm47CiAKICAgICAgICAgaWYgKGRlbHRhc1theGlzXVswXSA+IDApCi0gICAg ICAgICAgICBzdGQ6OnNvcnQoZGVsdGFzW2F4aXNdLmJlZ2luKCksIHN0ZDo6bmV4dChkZWx0YXNb YXhpc10uYmVnaW4oKSwgZmlyc3RaZXJvSW5kZXhbYXhpc10pLCBzdGQ6OmdyZWF0ZXI8ZmxvYXQ+ KCkpOworICAgICAgICAgICAgc3RkOjpzb3J0KGRlbHRhc1theGlzXS5iZWdpbigpLCBzdGQ6Om5l eHQoZGVsdGFzW2F4aXNdLmJlZ2luKCksIGZpcnN0WmVyb0luZGV4W2F4aXNdKSwgc3RkOjpncmVh dGVyKCkpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBzdGQ6OnNvcnQoZGVsdGFzW2F4aXNd LmJlZ2luKCksIHN0ZDo6bmV4dChkZWx0YXNbYXhpc10uYmVnaW4oKSwgZmlyc3RaZXJvSW5kZXhb YXhpc10pLCBzdGQ6Omxlc3M8ZmxvYXQ+KCkpOworICAgICAgICAgICAgc3RkOjpzb3J0KGRlbHRh c1theGlzXS5iZWdpbigpLCBzdGQ6Om5leHQoZGVsdGFzW2F4aXNdLmJlZ2luKCksIGZpcnN0WmVy b0luZGV4W2F4aXNdKSk7CiAgICAgfTsKIAogICAgIHNvcnREZWx0YXMoSG9yaXpvbnRhbCk7Cg==