Skip to content

[mono] Keep in-flight exception alive across LLVM resume unwind #129713

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

Merged
pavelsavara merged 8 commits into from
Jun 24, 2026
Merged

[mono] Keep in-flight exception alive across LLVM resume unwind #129713

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a64c1e7
[mono] Keep in-flight exception alive across LLVM resume unwind
pavelsavara Jun 22, 2026
de09b92
Merge remote-tracking branch 'upstream/main' into mono-llvm-resume-un…
pavelsavara Jun 23, 2026
52859ab
[mono] Make AOTed-catch ex_gchandle assignment defensive; trigger run…
pavelsavara Jun 23, 2026
24c4400
[mono] Regenerate wasm/wasi AOT offsets for ResumeState layout change
pavelsavara Jun 23, 2026
306d397
[mono] Update Android/Apple AOT offsets for ResumeState layout change
pavelsavara Jun 23, 2026
457a0e4
[mono] Guard mono_resume_unwind against an unset ex_gchandle
pavelsavara Jun 23, 2026
2fa26ce
Potential fix for pull request finding
lewing Jun 23, 2026
e4a3b20
[mono] Harden resume-unwind exception GC handle lifetime
pavelsavara Jun 24, 2026
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
16 changes: 14 additions & 2 deletions src/mono/mono/mini/mini-exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2560,7 +2560,15 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
* mono_resume_unwind () will call us again to continue
* the unwinding.
*/
jit_tls->resume_state.ex_obj = obj;
/*
* Keep the exception object alive across the (managed) finally
* handler using a pinned GC handle. The handler can reach a GC
* safepoint, and a moving GC would otherwise invalidate a raw
* pointer stored here (see mono_resume_unwind ()).
*/
if (jit_tls->resume_state.ex_gchandle)
mono_gchandle_free_internal (jit_tls->resume_state.ex_gchandle);
jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal (obj, TRUE);
Comment thread
BrzVlad marked this conversation as resolved.
Outdated
jit_tls->resume_state.ji = ji;
Comment thread
pavelsavara marked this conversation as resolved.
jit_tls->resume_state.clause_index = i + 1;
jit_tls->resume_state.ctx = *ctx;
Expand Down Expand Up @@ -3095,7 +3103,11 @@ mono_resume_unwind (MonoContext *ctx)
MONO_CONTEXT_SET_SP (ctx, MONO_CONTEXT_GET_SP (&jit_tls->resume_state.ctx));
new_ctx = *ctx;

mono_handle_exception_internal (&new_ctx, (MonoObject *)jit_tls->resume_state.ex_obj, TRUE, NULL);
MonoObject *ex_obj = mono_gchandle_get_target_internal (jit_tls->resume_state.ex_gchandle);
mono_gchandle_free_internal (jit_tls->resume_state.ex_gchandle);
jit_tls->resume_state.ex_gchandle = NULL;

mono_handle_exception_internal (&new_ctx, ex_obj, TRUE, NULL);

mono_restore_context (&new_ctx);
}
Expand Down
2 changes: 0 additions & 2 deletions src/mono/mono/mini/mini-runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ typedef struct {
MonoJitInfo *ji;
int clause_index;
MonoContext ctx, new_ctx;
/* FIXME: GC */
gpointer ex_obj;
MonoLMF *lmf;
Comment thread
pavelsavara marked this conversation as resolved.
int first_filter_idx, filter_idx;
/* MonoMethodILState */
Expand Down
4 changes: 0 additions & 4 deletions src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, valuetype [Microsoft.DotNet.XUnitExtensions]Xunit.TestRuntimes) = {
string('https://github.com/dotnet/runtime/issues/129508')
int32(0x2) // Mono
}
.entrypoint
.maxstack 3
.locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
Expand Down
Loading