Skip to content

druntime: defer rt_term to atexit on Emscripten #5129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ramen-bully wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −1
Open

druntime: defer rt_term to atexit on Emscripten #5129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion runtime/druntime/src/rt/dmain2.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@ extern (C) int rt_init()
return 0;
}

version (Emscripten)
{
private extern (C) void rt_term_atexit()
{
rt_term();
}
}
Copy link
Copy Markdown
Member

@kinke kinke May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest putting this as nested static function directly above the single usage below.


/**********************************************
* Terminate use of druntime.
*/
Expand Down Expand Up @@ -547,7 +555,12 @@ private extern (C) int _d_run_main2(char[][] args, size_t totalArgsLength, MainF
else
result = EXIT_FAILURE;

if (!rt_term())
version (Emscripten)
{
import core.stdc.stdlib : atexit;
atexit(&rt_term_atexit);
}
else if (!rt_term())
result = (result == EXIT_SUCCESS) ? EXIT_FAILURE : result;
}

Expand Down
Loading