mirror of
https://github.com/RGBCube/serenity
synced 2025-05-14 13:54:57 +00:00
LibWeb: Initialize static web strings during main-thread VM creation
These are currently initialized in a [[gnu::constructor]], which has a weird initialization order. These constructors are invoked before main() and, incidentally, before any user-defined default constructors of the static strings they are initializing. This will become an issue when these strings are ported to FlyString, which has a user-defined default constructor. In that scenario, when the FlyString constructor is executed after the [[gnu::constructor]], the strings will be "reset" to the empty string. Instead of relying on a non-standard compiler extension here, let's just initialize these strings explicitly during main-thread VM creation, as this now happens in WebContent's main().
This commit is contained in:
parent
0d0b87fd46
commit
db2ba5f1d9
19 changed files with 74 additions and 27 deletions
|
@ -12,11 +12,10 @@ namespace Web::HTML::EventNames {
|
|||
ENUMERATE_HTML_EVENTS
|
||||
#undef __ENUMERATE_HTML_EVENT
|
||||
|
||||
[[gnu::constructor]] static void initialize()
|
||||
ErrorOr<void> initialize_strings()
|
||||
{
|
||||
static bool s_initialized = false;
|
||||
if (s_initialized)
|
||||
return;
|
||||
VERIFY(!s_initialized);
|
||||
|
||||
#define __ENUMERATE_HTML_EVENT(name) \
|
||||
name = #name;
|
||||
|
@ -24,6 +23,7 @@ ENUMERATE_HTML_EVENTS
|
|||
#undef __ENUMERATE_HTML_EVENT
|
||||
|
||||
s_initialized = true;
|
||||
return {};
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue