194913 2019-02-21 12:32:39 -0800 [MSVC] Fix compilation errors with lambdas in ResourceLoadStatistics 2019-02-21 17:36:45 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 194267 1 don.olmstead don.olmstead achristensen bfulgham commit-queue webkit-bug-importer oldest_to_newest 1508610 0 don.olmstead 2019-02-21 12:32:39 -0800 There are issues compiling ResourceLoadStatisticsMemoryStore in MSVC around nested lambdas. This is true even in MSVS 2019 Preview 3 1508611 1 362628 don.olmstead 2019-02-21 12:40:38 -0800 Created attachment 362628 Patch 1508732 2 362628 bfulgham 2019-02-21 16:23:10 -0800 Comment on attachment 362628 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362628&action=review EWS seems happy, so this change looks good. > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:369 > + RunLoop::main().dispatch([this, weakThis = WTFMove(weakThis)]() { Interesting that MSVC doesn't like this. This actually seems like better code anyway. > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:33 > +#include "NetworkProcess.h" I wonder if this was missing because of the vagaries of our Unified Sources behavior. 1508749 3 don.olmstead 2019-02-21 16:41:43 -0800 (In reply to Brent Fulgham from comment #2) > Comment on attachment 362628 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=362628&action=review > > EWS seems happy, so this change looks good. > > > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:369 > > + RunLoop::main().dispatch([this, weakThis = WTFMove(weakThis)]() { > > Interesting that MSVC doesn't like this. This actually seems like better > code anyway. There are a bunch of bugs around lambdas in MSVC. Supposedly they were fixed but this was built with latest preview release of 2019 so 🤷 > > Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:33 > > +#include "NetworkProcess.h" > > I wonder if this was missing because of the vagaries of our Unified Sources > behavior. Most likely. I really hate Unified Sources. This https://bugs.webkit.org/show_bug.cgi?id=193073 needs to get fixed first. 1508768 4 362628 commit-queue 2019-02-21 17:05:13 -0800 Comment on attachment 362628 Patch Clearing flags on attachment: 362628 Committed r241924: <https://trac.webkit.org/changeset/241924> 1508769 5 commit-queue 2019-02-21 17:05:14 -0800 All reviewed patches have been landed. Closing bug. 1508787 6 webkit-bug-importer 2019-02-21 17:36:45 -0800 <rdar://problem/48297768> 362628 2019-02-21 12:40:38 -0800 2019-02-21 17:05:13 -0800 Patch bug-194913.diff text/plain 3916 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNGNmZDQzNGI3ZGEuLjJjMmNhYTQ5OTBkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDE5LTAyLTIxICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgW01TVkNdIEZpeCBjb21waWxhdGlvbiBlcnJvcnMgd2l0aCBsYW1iZGFzIGlu IFJlc291cmNlTG9hZFN0YXRpc3RpY3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NDkxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1TVkMgaGFzIHByb2JsZW1zIHdpdGggdGhlIHNjb3Bpbmcgb2YgYHRo aXNgIHdpdGhpbiBhIG5lc3RlZCBsYW1iZGEuIFRvIHdvcmsgYXJvdW5kIHRoZQorICAgICAgICBi ZWhhdmlvciB0aGUgZW5jbG9zaW5nIGxhbWJkYSdzIHdyYXBwaW5nIG9mIGB0aGlzYCBpcyB1c2Vk IHdpdGhpbiB0aGUgbmVzdGVkIGxhbWJkYS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0Ns YXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcDoKKyAgICAgICAg KFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpwcm9jZXNzU3RhdGlz dGljc0FuZERhdGFSZWNvcmRzKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3NHcmFudGVk KToKKwogMjAxOS0wMi0yMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgQVBJIHRlc3QgZml4IGFmdGVyIHIyNDE4NTUuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlz dGljc01lbW9yeVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3Np Zmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwCmluZGV4IDdlZTJhZDEw MTAwLi40MTgzYzBjNjUwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3NNZW1vcnlTdG9yZS5jcHAKQEAgLTM1NCw3ICszNTQsNyBAQCB2b2lkIFJlc291cmNlTG9h ZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6cHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3Jkcygp CiAgICAgICAgIH0KICAgICB9CiAKLSAgICByZW1vdmVEYXRhUmVjb3JkcyhbdGhpcywgd2Vha1Ro aXMgPSBtYWtlV2Vha1B0cigqdGhpcyldIHsKKyAgICByZW1vdmVEYXRhUmVjb3JkcyhbdGhpcywg d2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyldKCkgbXV0YWJsZSB7CiAgICAgICAgIEFTU0VS VCghUnVuTG9vcDo6aXNNYWluKCkpOwogICAgICAgICBpZiAoIXdlYWtUaGlzKQogICAgICAgICAg ICAgcmV0dXJuOwpAQCAtMzY2LDcgKzM2Niw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c01lbW9yeVN0b3JlOjpwcm9jZXNzU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCkKICAgICAgICAg aWYgKCFtX3BhcmFtZXRlcnMuc2hvdWxkTm90aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nh bm5lZCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlz cGF0Y2goW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSB7CisgICAgICAgIFJ1 bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlz KV0oKSB7CiAgICAgICAgICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogICAgICAgICAg ICAgaWYgKCF3ZWFrVGhpcykKICAgICAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmll ci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4IGUwZGFjMjFkNjc5Li4z MGZlOTFmNGMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFz c2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2luY2x1ZGUgIkFQSURpY3Rpb25hcnkuaCIK ICNpbmNsdWRlICJMb2dnaW5nLmgiCisjaW5jbHVkZSAiTmV0d29ya1Byb2Nlc3MuaCIKICNpbmNs dWRlICJOZXR3b3JrU2Vzc2lvbi5oIgogI2luY2x1ZGUgIlJlc291cmNlTG9hZFN0YXRpc3RpY3NN ZW1vcnlTdG9yZS5oIgogI2luY2x1ZGUgIlJlc291cmNlTG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50 U3RvcmFnZS5oIgpAQCAtMzA1LDcgKzMwNiw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpyZXF1ZXN0U3RvcmFnZUFjY2Vzc0dyYW50ZWQoY29uc3QgU3RyaW5nJiBzCiAg ICAgICAgICAgICBBU1NFUlRfVU5VU0VEKHByb21wdEVuYWJsZWQsIHByb21wdEVuYWJsZWQpOwog ICAgICAgICAgICAgYXV0byBzdWJGcmFtZVByaW1hcnlEb21haW4gPSBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzOjpwcmltYXJ5RG9tYWluKHN1YkZyYW1lSG9zdCk7CiAgICAgICAgICAgICBhdXRvIHRv cEZyYW1lUHJpbWFyeURvbWFpbiA9IFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OnByaW1hcnlEb21h aW4odG9wRnJhbWVIb3N0KTsKLSAgICAgICAgICAgIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9v bCk+IHJlcXVlc3RDb25maXJtYXRpb25Db21wbGV0aW9uSGFuZGxlciA9IFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHN1YkZyYW1lSG9zdCA9IFdURk1vdmUoc3ViRnJhbWVI b3N0KSwgdG9wRnJhbWVIb3N0ID0gV1RGTW92ZSh0b3BGcmFtZUhvc3QpLCBmcmFtZUlELCBwYWdl SUQsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildIChib29s IHVzZXJEaWRHcmFudEFjY2VzcykgbXV0YWJsZSB7CisgICAgICAgICAgICBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGJvb2wpPiByZXF1ZXN0Q29uZmlybWF0aW9uQ29tcGxldGlvbkhhbmRsZXIgPSBb dGhpcywgcHJvdGVjdGVkVGhpcyA9IHByb3RlY3RlZFRoaXMuY29weVJlZigpLCBzdWJGcmFtZUhv c3QgPSBXVEZNb3ZlKHN1YkZyYW1lSG9zdCksIHRvcEZyYW1lSG9zdCA9IFdURk1vdmUodG9wRnJh bWVIb3N0KSwgZnJhbWVJRCwgcGFnZUlELCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29t cGxldGlvbkhhbmRsZXIpXSAoYm9vbCB1c2VyRGlkR3JhbnRBY2Nlc3MpIG11dGFibGUgewogICAg ICAgICAgICAgICAgIGlmICh1c2VyRGlkR3JhbnRBY2Nlc3MpCiAgICAgICAgICAgICAgICAgICAg IGdyYW50U3RvcmFnZUFjY2VzcyhXVEZNb3ZlKHN1YkZyYW1lSG9zdCksIFdURk1vdmUodG9wRnJh bWVIb3N0KSwgZnJhbWVJRCwgcGFnZUlELCB1c2VyRGlkR3JhbnRBY2Nlc3MsIFdURk1vdmUoY29t cGxldGlvbkhhbmRsZXIpKTsKICAgICAgICAgICAgICAgICBlbHNlCg==