Bug 226433 – Remove WTF::Optional synonym for std::optional, using that class template directly instead

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Darin Adler]

Remove WTF::Optional synonym for std::optional, using that class template directly instead

[Darin Adler]

Created attachment 430130 [details]
Patch

[EWS Watchlist]

Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API

This patch modifies the inspector protocol generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-inspector-generator-tests --reset-results`)

[Darin Adler]

Created attachment 430131 [details]
Patch

[Chris Dumez]

Comment on attachment 430131 [details]
Patch

R=me once the bots are happy.

[Darin Adler]

Created attachment 430132 [details]
Patch

[EWS]

Committed r278253 (238290@main): <https://commits.webkit.org/238290@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 430132 [details].

[Radar WebKit Bug Importer]

<rdar://problem/78664888>

[Chris Dumez]

Seems to have broken the Windows build:
https://build.webkit.org/#/builders/67/builds/3216/steps/8/logs/errors

The issue is not super obvious to me.

[Chris Dumez]

(In reply to Chris Dumez from comment #8)
> Seems to have broken the Windows build:
> https://build.webkit.org/#/builders/67/builds/3216/steps/8/logs/errors
> 
> The issue is not super obvious to me.

The include is there so I am wondering if there is a `#define optional` somewhere that is polluting us?

[Chris Dumez]

(In reply to Chris Dumez from comment #9)
> (In reply to Chris Dumez from comment #8)
> > Seems to have broken the Windows build:
> > https://build.webkit.org/#/builders/67/builds/3216/steps/8/logs/errors
> > 
> > The issue is not super obvious to me.
> 
> The include is there so I am wondering if there is a `#define optional`
> somewhere that is polluting us?

Or maybe that bot just needs a clean build. Some of the build output still refers to "Optional":
'Inspector::Protocol::Helpers::Optional': definition of dllimport data not allowed

[Darin Adler]

Maybe Windows uses a different "erb" file? The EWS Windows build didn’t fail, though!

[Chris Dumez]

(In reply to Darin Adler from comment #11)
> Maybe Windows uses a different "erb" file? The EWS Windows build didn’t
> fail, though!

And the boy recovered on its own on the next build. It was an incremental build issue I believe.

[Chris Dumez]

Follow-up build fix in <https://commits.webkit.org/r278319>.

[Chris Dumez]

(In reply to Chris Dumez from comment #13)
> Follow-up build fix in <https://commits.webkit.org/r278319>.

And <https://commits.webkit.org/r278320>

[Michael Catanzaro]

Very nice!

[Simon Fraser (smfr)]

Will the style checker tell me if I use the old thing? A webkit-dev email is probably justified too.

[Darin Adler]

We can add it to the style checker, but also it won’t compile.

[Simon Fraser (smfr)]

Not compiling seems sufficient. But a webkit-dev heads-up would be welcome.

[Darin Adler]

(In reply to Simon Fraser (smfr) from comment #18)
> Not compiling seems sufficient. But a webkit-dev heads-up would be welcome.

https://lists.webkit.org/pipermail/webkit-dev/2021-June/031875.html