Bug 182797 – Make maximumParallelReadCount static to fix lambda capture error in WebKit::NetworkCache::Storage::traverse()

• Component: WebKit2
• Status: RESOLVED FIXED

[John Wilander]

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.

[Radar WebKit Bug Importer]

<rdar://problem/37540594>

[John Wilander]

Created attachment 333820 [details]
Patch

[Andy Estes]

Comment on attachment 333820 [details]
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!

[John Wilander]

Yeah. I wonder if clang optimizes it and moved it into the lambda?

[Andy Estes]

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.

[John Wilander]

Created attachment 333823 [details]
Patch

[John Wilander]

WPE tree seems red.

[John Wilander]

Comment on attachment 333823 [details]
Patch

Thanks, Tim and Andy!

[John Wilander]

Committed r228478: <https://trac.webkit.org/changeset/228478>