182797 2018-02-14 10:51:59 -0800 Make maximumParallelReadCount static to fix lambda capture error in WebKit::NetworkCache::Storage::traverse() 2018-02-14 11:47:59 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=182679 InRadar P2 Normal --- 1 wilander wilander aestes cdumez cgarcia ews-watchlist mcatanzaro ross.kirsling thorton webkit-bug-importer Yousuke.Kimoto oldest_to_newest 1399158 0 wilander 2018-02-14 10:51:59 -0800 https://trac.webkit.org/changeset/228455 added a lambda capture of const unsigned maximumParallelReadCount. Such a capture is not needed and causes a build error when you run with -Wunused-lambda-capture: WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp:911:79: error: lambda capture 'maximumParallelReadCount' is not required to be captured for this use [-Werror,-Wunused-lambda-capture] traverseOperation.activeCondition.wait(lock, [&traverseOperation, maximumParallelReadCount] { ^ 1 error generated. 1399163 1 webkit-bug-importer 2018-02-14 10:54:58 -0800 <rdar://problem/37540594> 1399172 2 333820 wilander 2018-02-14 11:11:08 -0800 Created attachment 333820 Patch 1399179 3 333820 aestes 2018-02-14 11:22:11 -0800 Comment on attachment 333820 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333820&action=review > Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp:911 > - traverseOperation.activeCondition.wait(lock, [&traverseOperation, maximumParallelReadCount] { > + traverseOperation.activeCondition.wait(lock, [&traverseOperation] { Seems like a clang bug if it's warning about maximumParallelReadCount being unused. It's clearly used! 1399180 4 wilander 2018-02-14 11:24:33 -0800 Yeah. I wonder if clang optimizes it and moved it into the lambda? 1399181 5 aestes 2018-02-14 11:25:30 -0800 This patch might be ok if GCC allows maximumParallelReadCount to be used without being captured. We should see what EWS says. Otherwise, we might need to either move the definition of maximumParallelReadCount into the lambda, or make it static. 1399186 6 333823 wilander 2018-02-14 11:30:07 -0800 Created attachment 333823 Patch 1399195 7 wilander 2018-02-14 11:37:14 -0800 WPE tree seems red. 1399197 8 333823 wilander 2018-02-14 11:43:45 -0800 Comment on attachment 333823 Patch Thanks, Tim and Andy! 1399201 9 wilander 2018-02-14 11:47:59 -0800 Committed r228478: <https://trac.webkit.org/changeset/228478> 333820 2018-02-14 11:11:08 -0800 2018-02-14 11:30:05 -0800 Patch bug-182797-20180214111108.patch text/plain 1601 wilander SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjg0NzIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE4LTAyLTE0ICBKb2huIFdpbGFu ZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGNhcHR1cmUgbWF4aW11 bVBhcmFsbGVsUmVhZENvdW50IGluIGxhbWJkYSBpbiBXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3Rv cmFnZTo6dHJhdmVyc2UoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTgyNzk3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzU0MDU5ND4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNhcHR1cmUg d2FzIGFkZGVkIGluIHIyMjg0NTUgYW5kIGNhdXNlcyBhIGJ1aWxkIGZhaWx1cmUgd2hlbgorICAg ICAgICBydW4gd2l0aCAtV3VudXNlZC1sYW1iZGEtY2FwdHVyZS4gWGNvZGUgYWxzbyB3YXJucyBh Ym91dCBpdC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0 b3JhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OnRyYXZl cnNlKToKKwogMjAxOC0wMi0xNCAgTWF1cmVlbiBEYXVtICA8bWRhdW1AYXBwbGUuY29tPgogCiAg ICAgICAgIEFkZCBDIFNQSSBmb3Igc3VwcG9ydCBvZiBXZWJzaXRlIERhdGEgU3RvcmUgaW4gV2Vi c2l0ZSBQb2xpY2llcwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCShyZXZpc2lvbiAyMjg0NzAp CisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3Jh Z2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MDgsNyArOTA4LDcgQEAgdm9pZCBTdG9yYWdlOjp0 cmF2ZXJzZShjb25zdCBTdHJpbmcmIHR5cAogICAgICAgICAgICAgfSk7CiAKICAgICAgICAgICAg IGNvbnN0IHVuc2lnbmVkIG1heGltdW1QYXJhbGxlbFJlYWRDb3VudCA9IDU7Ci0gICAgICAgICAg ICB0cmF2ZXJzZU9wZXJhdGlvbi5hY3RpdmVDb25kaXRpb24ud2FpdChsb2NrLCBbJnRyYXZlcnNl T3BlcmF0aW9uLCBtYXhpbXVtUGFyYWxsZWxSZWFkQ291bnRdIHsKKyAgICAgICAgICAgIHRyYXZl cnNlT3BlcmF0aW9uLmFjdGl2ZUNvbmRpdGlvbi53YWl0KGxvY2ssIFsmdHJhdmVyc2VPcGVyYXRp b25dIHsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJhdmVyc2VPcGVyYXRpb24uYWN0aXZlQ291 bnQgPD0gbWF4aW11bVBhcmFsbGVsUmVhZENvdW50OwogICAgICAgICAgICAgfSk7CiAgICAgICAg IH0pOwo= 333823 2018-02-14 11:30:07 -0800 2018-02-14 11:42:49 -0800 Patch bug-182797-20180214113006.patch text/plain 1746 wilander SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjg0NzIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE4LTAyLTE0ICBKb2huIFdpbGFu ZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgbWF4aW11bVBhcmFsbGVs UmVhZENvdW50IHN0YXRpYyB0byBmaXggbGFtYmRhIGNhcHR1cmUgZXJyb3IgaW4gV2ViS2l0OjpO ZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OnRyYXZlcnNlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Mjc5NworICAgICAgICA8cmRhcjovL3Byb2JsZW0v Mzc1NDA1OTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBjYXB0dXJlIHdhcyBhZGRlZCBpbiByMjI4NDU1IGFuZCBjYXVzZXMgYSBidWlsZCBm YWlsdXJlIHdoZW4KKyAgICAgICAgcnVuIHdpdGggLVd1bnVzZWQtbGFtYmRhLWNhcHR1cmUuIFhj b2RlIGFsc28gd2FybnMgYWJvdXQgaXQuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hl OjpTdG9yYWdlOjp0cmF2ZXJzZSk6CisKIDIwMTgtMDItMTQgIE1hdXJlZW4gRGF1bSAgPG1kYXVt QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgQyBTUEkgZm9yIHN1cHBvcnQgb2YgV2Vic2l0ZSBE YXRhIFN0b3JlIGluIFdlYnNpdGUgUG9saWNpZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAko cmV2aXNpb24gMjI4NDcwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTA3LDggKzkwNyw4IEBA IHZvaWQgU3RvcmFnZTo6dHJhdmVyc2UoY29uc3QgU3RyaW5nJiB0eXAKICAgICAgICAgICAgICAg ICB0cmF2ZXJzZU9wZXJhdGlvbi5hY3RpdmVDb25kaXRpb24ubm90aWZ5T25lKCk7CiAgICAgICAg ICAgICB9KTsKIAotICAgICAgICAgICAgY29uc3QgdW5zaWduZWQgbWF4aW11bVBhcmFsbGVsUmVh ZENvdW50ID0gNTsKLSAgICAgICAgICAgIHRyYXZlcnNlT3BlcmF0aW9uLmFjdGl2ZUNvbmRpdGlv bi53YWl0KGxvY2ssIFsmdHJhdmVyc2VPcGVyYXRpb24sIG1heGltdW1QYXJhbGxlbFJlYWRDb3Vu dF0geworICAgICAgICAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIG1heGltdW1QYXJhbGxlbFJl YWRDb3VudCA9IDU7CisgICAgICAgICAgICB0cmF2ZXJzZU9wZXJhdGlvbi5hY3RpdmVDb25kaXRp b24ud2FpdChsb2NrLCBbJnRyYXZlcnNlT3BlcmF0aW9uXSB7CiAgICAgICAgICAgICAgICAgcmV0 dXJuIHRyYXZlcnNlT3BlcmF0aW9uLmFjdGl2ZUNvdW50IDw9IG1heGltdW1QYXJhbGxlbFJlYWRD b3VudDsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsK