[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 all commits
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
7 changes: 7 additions & 0 deletions eng/pipelines/runtime-llvm.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ pr:
- src/mono/mono/mini/decompose.c
- src/mono/mono/mini/method-to-ir.c
- src/mono/mono/mini/mini.c
- src/mono/mono/mini/mini-amd64*.*
- src/mono/mono/mini/mini-arm64*.*
- src/mono/mono/mini/mini-arm*.*
- src/mono/mono/mini/mini-riscv*.*
- src/mono/mono/mini/mini-exceptions.*
- src/mono/mono/mini/exceptions-*.*
- src/mono/mono/mini/mini-runtime.*

variables:
- template: /eng/pipelines/common/variables.yml
Expand Down
41 changes: 37 additions & 4 deletions src/mono/mono/mini/mini-exceptions.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2498,8 +2498,16 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
* methods, then execute the clause and the rest of the method
* using the interpreter.
*/
g_assert (!jit_tls->resume_state.ex_gchandle);
jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal ((MonoObject*)obj, TRUE);
/*
* resume_state.ex_gchandle is shared with the finally-resume path
* (mono_handle_exception_internal above). If a finally handler threw a
* superseding exception that is now being caught here, that path left a
* handle behind that will never be resumed; free it instead of
* asserting, mirroring the finally path.
*/
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 ((MonoObject*)obj, FALSE);
jit_tls->resume_state.ji = ji;
jit_tls->resume_state.clause_index = i;
jit_tls->resume_state.il_state = frame.il_state;
Expand DownExpand Up@@ -2560,7 +2568,16 @@ 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 GC handle. The handler can reach a GC
* safepoint, and a moving GC would otherwise collect the exception
* (or invalidate a raw pointer stored here); the handle keeps it
* alive and tracks relocation (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, FALSE);
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 DownExpand Up@@ -3095,7 +3112,23 @@ 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);
/*
* Copy the GC handle to a local and clear resume_state.ex_gchandle *before* calling
* mono_handle_exception_internal (). That call runs the managed catch/finally search,
* which can trigger a GC or a nested LLVM finally resume that installs its own
* ex_gchandle. Keeping the handle alive across the call (and freeing it only afterwards)
* ensures ex_obj stays rooted, and clearing the field first avoids accidentally freeing a
* newly-installed handle from a nested resume.
*/
MonoGCHandle ex_gchandle = jit_tls->resume_state.ex_gchandle;
jit_tls->resume_state.ex_gchandle = NULL;

MonoObject *ex_obj = ex_gchandle ? mono_gchandle_get_target_internal (ex_gchandle) : NULL;

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

if (ex_gchandle)
mono_gchandle_free_internal (ex_gchandle);

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 numberDiff line numberDiff 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;
int first_filter_idx, filter_idx;
/* MonoMethodILState */
Expand Down
22 changes: 11 additions & 11 deletions src/mono/mono/offsets/aarch64-apple-darwin10.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
22 changes: 11 additions & 11 deletions src/mono/mono/offsets/aarch64-apple-maccatalyst.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
22 changes: 11 additions & 11 deletions src/mono/mono/offsets/aarch64-v8a-linux-android.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
22 changes: 11 additions & 11 deletions src/mono/mono/offsets/armv7-none-linux-androideabi.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,1168)
DECL_SIZE2(MonoJitTlsData,1164)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -258,16 +258,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,56)
DECL_OFFSET2(MonoJitTlsData,resume_state,264)
DECL_OFFSET2(MonoJitTlsData,handler_block,712)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,720)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,928)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1140)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1144)
DECL_OFFSET2(MonoJitTlsData,calling_image,1148)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1152)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1156)
DECL_OFFSET2(MonoJitTlsData,interp_context,1160)
DECL_OFFSET2(MonoJitTlsData,handler_block,708)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,716)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,924)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1132)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1140)
DECL_OFFSET2(MonoJitTlsData,calling_image,1144)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1148)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1152)
DECL_OFFSET2(MonoJitTlsData,interp_context,1156)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down
22 changes: 11 additions & 11 deletions src/mono/mono/offsets/i686-none-linux-android.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,296)
DECL_SIZE2(MonoJitTlsData,292)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -259,16 +259,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,88)
DECL_OFFSET2(MonoJitTlsData,handler_block,192)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,196)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,232)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,268)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,272)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,276)
DECL_OFFSET2(MonoJitTlsData,calling_image,280)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,284)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,288)
DECL_OFFSET2(MonoJitTlsData,interp_context,292)
DECL_OFFSET2(MonoJitTlsData,handler_block,188)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,192)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,228)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,264)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,268)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,272)
DECL_OFFSET2(MonoJitTlsData,calling_image,276)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,280)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,284)
DECL_OFFSET2(MonoJitTlsData,interp_context,288)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down
22 changes: 11 additions & 11 deletions src/mono/mono/offsets/wasm32-unknown-none.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down
22 changes: 11 additions & 11 deletions src/mono/mono/offsets/wasm32-unknown-wasip2.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down
22 changes: 11 additions & 11 deletions src/mono/mono/offsets/x86_64-apple-darwin10.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,2240)
DECL_SIZE2(MonoJitTlsData,2232)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -252,16 +252,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,496)
DECL_OFFSET2(MonoJitTlsData,handler_block,1360)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1376)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1776)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2184)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2192)
DECL_OFFSET2(MonoJitTlsData,calling_image,2200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2208)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2216)
DECL_OFFSET2(MonoJitTlsData,interp_context,2224)
DECL_OFFSET2(MonoJitTlsData,handler_block,1352)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1368)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1768)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2168)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2184)
DECL_OFFSET2(MonoJitTlsData,calling_image,2192)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2208)
DECL_OFFSET2(MonoJitTlsData,interp_context,2216)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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 all commits
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


7 changes: 7 additions & 0 deletions
eng/pipelines/runtime-llvm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ pr:
 - src/mono/mono/mini/decompose.c
 - src/mono/mono/mini/method-to-ir.c
 - src/mono/mono/mini/mini.c
 - src/mono/mono/mini/mini-amd64*.*
 - src/mono/mono/mini/mini-arm64*.*
 - src/mono/mono/mini/mini-arm*.*
 - src/mono/mono/mini/mini-riscv*.*
 - src/mono/mono/mini/mini-exceptions.*
 - src/mono/mono/mini/exceptions-*.*
 - src/mono/mono/mini/mini-runtime.*

variables:
 - template: /eng/pipelines/common/variables.yml
Expand Down

41 changes: 37 additions & 4 deletions
src/mono/mono/mini/mini-exceptions.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2498,8 +2498,16 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
 * methods, then execute the clause and the rest of the method
 * using the interpreter.
 */
 g_assert (!jit_tls->resume_state.ex_gchandle);
 jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal ((MonoObject*)obj, TRUE);
 /*
 * resume_state.ex_gchandle is shared with the finally-resume path
 * (mono_handle_exception_internal above). If a finally handler threw a
 * superseding exception that is now being caught here, that path left a
 * handle behind that will never be resumed; free it instead of
 * asserting, mirroring the finally path.
 */
 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 ((MonoObject*)obj, FALSE);
 jit_tls->resume_state.ji = ji;
 jit_tls->resume_state.clause_index = i;
 jit_tls->resume_state.il_state = frame.il_state;
Expand DownExpand Up@@ -2560,7 +2568,16 @@ 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 GC handle. The handler can reach a GC
 * safepoint, and a moving GC would otherwise collect the exception
 * (or invalidate a raw pointer stored here); the handle keeps it
 * alive and tracks relocation (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, FALSE);
 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 DownExpand Up@@ -3095,7 +3112,23 @@ 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);
	/*
 * Copy the GC handle to a local and clear resume_state.ex_gchandle *before* calling
 * mono_handle_exception_internal (). That call runs the managed catch/finally search,
 * which can trigger a GC or a nested LLVM finally resume that installs its own
 * ex_gchandle. Keeping the handle alive across the call (and freeing it only afterwards)
 * ensures ex_obj stays rooted, and clearing the field first avoids accidentally freeing a
 * newly-installed handle from a nested resume.
 */
	MonoGCHandle ex_gchandle = jit_tls->resume_state.ex_gchandle;
	jit_tls->resume_state.ex_gchandle = NULL;

	MonoObject *ex_obj = ex_gchandle ? mono_gchandle_get_target_internal (ex_gchandle) : NULL;

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

	if (ex_gchandle)
 mono_gchandle_free_internal (ex_gchandle);

	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 numberDiff line numberDiff 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;
	int first_filter_idx, filter_idx;
	/* MonoMethodILState */
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-maccatalyst.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-v8a-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/armv7-none-linux-androideabi.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,1168)
DECL_SIZE2(MonoJitTlsData,1164)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -258,16 +258,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,56)
DECL_OFFSET2(MonoJitTlsData,resume_state,264)
DECL_OFFSET2(MonoJitTlsData,handler_block,712)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,720)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,928)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1140)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1144)
DECL_OFFSET2(MonoJitTlsData,calling_image,1148)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1152)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1156)
DECL_OFFSET2(MonoJitTlsData,interp_context,1160)
DECL_OFFSET2(MonoJitTlsData,handler_block,708)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,716)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,924)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1132)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1140)
DECL_OFFSET2(MonoJitTlsData,calling_image,1144)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1148)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1152)
DECL_OFFSET2(MonoJitTlsData,interp_context,1156)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/i686-none-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,296)
DECL_SIZE2(MonoJitTlsData,292)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -259,16 +259,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,88)
DECL_OFFSET2(MonoJitTlsData,handler_block,192)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,196)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,232)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,268)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,272)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,276)
DECL_OFFSET2(MonoJitTlsData,calling_image,280)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,284)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,288)
DECL_OFFSET2(MonoJitTlsData,interp_context,292)
DECL_OFFSET2(MonoJitTlsData,handler_block,188)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,192)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,228)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,264)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,268)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,272)
DECL_OFFSET2(MonoJitTlsData,calling_image,276)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,280)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,284)
DECL_OFFSET2(MonoJitTlsData,interp_context,288)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-none.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-wasip2.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/x86_64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,2240)
DECL_SIZE2(MonoJitTlsData,2232)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -252,16 +252,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,496)
DECL_OFFSET2(MonoJitTlsData,handler_block,1360)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1376)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1776)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2184)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2192)
DECL_OFFSET2(MonoJitTlsData,calling_image,2200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2208)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2216)
DECL_OFFSET2(MonoJitTlsData,interp_context,2224)
DECL_OFFSET2(MonoJitTlsData,handler_block,1352)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1368)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1768)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2168)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2184)
DECL_OFFSET2(MonoJitTlsData,calling_image,2192)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2208)
DECL_OFFSET2(MonoJitTlsData,interp_context,2216)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all commits
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


7 changes: 7 additions & 0 deletions
eng/pipelines/runtime-llvm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ pr:
 - src/mono/mono/mini/decompose.c
 - src/mono/mono/mini/method-to-ir.c
 - src/mono/mono/mini/mini.c
 - src/mono/mono/mini/mini-amd64*.*
 - src/mono/mono/mini/mini-arm64*.*
 - src/mono/mono/mini/mini-arm*.*
 - src/mono/mono/mini/mini-riscv*.*
 - src/mono/mono/mini/mini-exceptions.*
 - src/mono/mono/mini/exceptions-*.*
 - src/mono/mono/mini/mini-runtime.*

variables:
 - template: /eng/pipelines/common/variables.yml
Expand Down

41 changes: 37 additions & 4 deletions
src/mono/mono/mini/mini-exceptions.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2498,8 +2498,16 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
 * methods, then execute the clause and the rest of the method
 * using the interpreter.
 */
 g_assert (!jit_tls->resume_state.ex_gchandle);
 jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal ((MonoObject*)obj, TRUE);
 /*
 * resume_state.ex_gchandle is shared with the finally-resume path
 * (mono_handle_exception_internal above). If a finally handler threw a
 * superseding exception that is now being caught here, that path left a
 * handle behind that will never be resumed; free it instead of
 * asserting, mirroring the finally path.
 */
 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 ((MonoObject*)obj, FALSE);
 jit_tls->resume_state.ji = ji;
 jit_tls->resume_state.clause_index = i;
 jit_tls->resume_state.il_state = frame.il_state;
Expand DownExpand Up@@ -2560,7 +2568,16 @@ 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 GC handle. The handler can reach a GC
 * safepoint, and a moving GC would otherwise collect the exception
 * (or invalidate a raw pointer stored here); the handle keeps it
 * alive and tracks relocation (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, FALSE);
 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 DownExpand Up@@ -3095,7 +3112,23 @@ 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);
	/*
 * Copy the GC handle to a local and clear resume_state.ex_gchandle *before* calling
 * mono_handle_exception_internal (). That call runs the managed catch/finally search,
 * which can trigger a GC or a nested LLVM finally resume that installs its own
 * ex_gchandle. Keeping the handle alive across the call (and freeing it only afterwards)
 * ensures ex_obj stays rooted, and clearing the field first avoids accidentally freeing a
 * newly-installed handle from a nested resume.
 */
	MonoGCHandle ex_gchandle = jit_tls->resume_state.ex_gchandle;
	jit_tls->resume_state.ex_gchandle = NULL;

	MonoObject *ex_obj = ex_gchandle ? mono_gchandle_get_target_internal (ex_gchandle) : NULL;

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

	if (ex_gchandle)
 mono_gchandle_free_internal (ex_gchandle);

	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 numberDiff line numberDiff 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;
	int first_filter_idx, filter_idx;
	/* MonoMethodILState */
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-maccatalyst.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-v8a-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/armv7-none-linux-androideabi.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,1168)
DECL_SIZE2(MonoJitTlsData,1164)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -258,16 +258,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,56)
DECL_OFFSET2(MonoJitTlsData,resume_state,264)
DECL_OFFSET2(MonoJitTlsData,handler_block,712)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,720)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,928)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1140)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1144)
DECL_OFFSET2(MonoJitTlsData,calling_image,1148)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1152)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1156)
DECL_OFFSET2(MonoJitTlsData,interp_context,1160)
DECL_OFFSET2(MonoJitTlsData,handler_block,708)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,716)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,924)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1132)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1140)
DECL_OFFSET2(MonoJitTlsData,calling_image,1144)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1148)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1152)
DECL_OFFSET2(MonoJitTlsData,interp_context,1156)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/i686-none-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,296)
DECL_SIZE2(MonoJitTlsData,292)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -259,16 +259,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,88)
DECL_OFFSET2(MonoJitTlsData,handler_block,192)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,196)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,232)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,268)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,272)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,276)
DECL_OFFSET2(MonoJitTlsData,calling_image,280)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,284)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,288)
DECL_OFFSET2(MonoJitTlsData,interp_context,292)
DECL_OFFSET2(MonoJitTlsData,handler_block,188)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,192)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,228)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,264)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,268)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,272)
DECL_OFFSET2(MonoJitTlsData,calling_image,276)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,280)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,284)
DECL_OFFSET2(MonoJitTlsData,interp_context,288)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-none.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-wasip2.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/x86_64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,2240)
DECL_SIZE2(MonoJitTlsData,2232)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -252,16 +252,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,496)
DECL_OFFSET2(MonoJitTlsData,handler_block,1360)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1376)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1776)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2184)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2192)
DECL_OFFSET2(MonoJitTlsData,calling_image,2200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2208)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2216)
DECL_OFFSET2(MonoJitTlsData,interp_context,2224)
DECL_OFFSET2(MonoJitTlsData,handler_block,1352)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1368)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1768)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2168)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2184)
DECL_OFFSET2(MonoJitTlsData,calling_image,2192)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2208)
DECL_OFFSET2(MonoJitTlsData,interp_context,2216)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all commits
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


7 changes: 7 additions & 0 deletions
eng/pipelines/runtime-llvm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ pr:
 - src/mono/mono/mini/decompose.c
 - src/mono/mono/mini/method-to-ir.c
 - src/mono/mono/mini/mini.c
 - src/mono/mono/mini/mini-amd64*.*
 - src/mono/mono/mini/mini-arm64*.*
 - src/mono/mono/mini/mini-arm*.*
 - src/mono/mono/mini/mini-riscv*.*
 - src/mono/mono/mini/mini-exceptions.*
 - src/mono/mono/mini/exceptions-*.*
 - src/mono/mono/mini/mini-runtime.*

variables:
 - template: /eng/pipelines/common/variables.yml
Expand Down

41 changes: 37 additions & 4 deletions
src/mono/mono/mini/mini-exceptions.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2498,8 +2498,16 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
 * methods, then execute the clause and the rest of the method
 * using the interpreter.
 */
 g_assert (!jit_tls->resume_state.ex_gchandle);
 jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal ((MonoObject*)obj, TRUE);
 /*
 * resume_state.ex_gchandle is shared with the finally-resume path
 * (mono_handle_exception_internal above). If a finally handler threw a
 * superseding exception that is now being caught here, that path left a
 * handle behind that will never be resumed; free it instead of
 * asserting, mirroring the finally path.
 */
 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 ((MonoObject*)obj, FALSE);
 jit_tls->resume_state.ji = ji;
 jit_tls->resume_state.clause_index = i;
 jit_tls->resume_state.il_state = frame.il_state;
Expand DownExpand Up@@ -2560,7 +2568,16 @@ 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 GC handle. The handler can reach a GC
 * safepoint, and a moving GC would otherwise collect the exception
 * (or invalidate a raw pointer stored here); the handle keeps it
 * alive and tracks relocation (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, FALSE);
 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 DownExpand Up@@ -3095,7 +3112,23 @@ 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);
	/*
 * Copy the GC handle to a local and clear resume_state.ex_gchandle *before* calling
 * mono_handle_exception_internal (). That call runs the managed catch/finally search,
 * which can trigger a GC or a nested LLVM finally resume that installs its own
 * ex_gchandle. Keeping the handle alive across the call (and freeing it only afterwards)
 * ensures ex_obj stays rooted, and clearing the field first avoids accidentally freeing a
 * newly-installed handle from a nested resume.
 */
	MonoGCHandle ex_gchandle = jit_tls->resume_state.ex_gchandle;
	jit_tls->resume_state.ex_gchandle = NULL;

	MonoObject *ex_obj = ex_gchandle ? mono_gchandle_get_target_internal (ex_gchandle) : NULL;

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

	if (ex_gchandle)
 mono_gchandle_free_internal (ex_gchandle);

	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 numberDiff line numberDiff 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;
	int first_filter_idx, filter_idx;
	/* MonoMethodILState */
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-maccatalyst.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-v8a-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/armv7-none-linux-androideabi.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,1168)
DECL_SIZE2(MonoJitTlsData,1164)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -258,16 +258,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,56)
DECL_OFFSET2(MonoJitTlsData,resume_state,264)
DECL_OFFSET2(MonoJitTlsData,handler_block,712)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,720)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,928)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1140)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1144)
DECL_OFFSET2(MonoJitTlsData,calling_image,1148)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1152)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1156)
DECL_OFFSET2(MonoJitTlsData,interp_context,1160)
DECL_OFFSET2(MonoJitTlsData,handler_block,708)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,716)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,924)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1132)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1140)
DECL_OFFSET2(MonoJitTlsData,calling_image,1144)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1148)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1152)
DECL_OFFSET2(MonoJitTlsData,interp_context,1156)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/i686-none-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,296)
DECL_SIZE2(MonoJitTlsData,292)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -259,16 +259,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,88)
DECL_OFFSET2(MonoJitTlsData,handler_block,192)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,196)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,232)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,268)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,272)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,276)
DECL_OFFSET2(MonoJitTlsData,calling_image,280)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,284)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,288)
DECL_OFFSET2(MonoJitTlsData,interp_context,292)
DECL_OFFSET2(MonoJitTlsData,handler_block,188)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,192)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,228)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,264)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,268)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,272)
DECL_OFFSET2(MonoJitTlsData,calling_image,276)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,280)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,284)
DECL_OFFSET2(MonoJitTlsData,interp_context,288)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-none.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-wasip2.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/x86_64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,2240)
DECL_SIZE2(MonoJitTlsData,2232)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -252,16 +252,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,496)
DECL_OFFSET2(MonoJitTlsData,handler_block,1360)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1376)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1776)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2184)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2192)
DECL_OFFSET2(MonoJitTlsData,calling_image,2200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2208)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2216)
DECL_OFFSET2(MonoJitTlsData,interp_context,2224)
DECL_OFFSET2(MonoJitTlsData,handler_block,1352)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1368)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1768)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2168)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2184)
DECL_OFFSET2(MonoJitTlsData,calling_image,2192)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2208)
DECL_OFFSET2(MonoJitTlsData,interp_context,2216)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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 all commits
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


7 changes: 7 additions & 0 deletions
eng/pipelines/runtime-llvm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ pr:
 - src/mono/mono/mini/decompose.c
 - src/mono/mono/mini/method-to-ir.c
 - src/mono/mono/mini/mini.c
 - src/mono/mono/mini/mini-amd64*.*
 - src/mono/mono/mini/mini-arm64*.*
 - src/mono/mono/mini/mini-arm*.*
 - src/mono/mono/mini/mini-riscv*.*
 - src/mono/mono/mini/mini-exceptions.*
 - src/mono/mono/mini/exceptions-*.*
 - src/mono/mono/mini/mini-runtime.*

variables:
 - template: /eng/pipelines/common/variables.yml
Expand Down

41 changes: 37 additions & 4 deletions
src/mono/mono/mini/mini-exceptions.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2498,8 +2498,16 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
 * methods, then execute the clause and the rest of the method
 * using the interpreter.
 */
 g_assert (!jit_tls->resume_state.ex_gchandle);
 jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal ((MonoObject*)obj, TRUE);
 /*
 * resume_state.ex_gchandle is shared with the finally-resume path
 * (mono_handle_exception_internal above). If a finally handler threw a
 * superseding exception that is now being caught here, that path left a
 * handle behind that will never be resumed; free it instead of
 * asserting, mirroring the finally path.
 */
 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 ((MonoObject*)obj, FALSE);
 jit_tls->resume_state.ji = ji;
 jit_tls->resume_state.clause_index = i;
 jit_tls->resume_state.il_state = frame.il_state;
Expand DownExpand Up@@ -2560,7 +2568,16 @@ 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 GC handle. The handler can reach a GC
 * safepoint, and a moving GC would otherwise collect the exception
 * (or invalidate a raw pointer stored here); the handle keeps it
 * alive and tracks relocation (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, FALSE);
 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 DownExpand Up@@ -3095,7 +3112,23 @@ 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);
	/*
 * Copy the GC handle to a local and clear resume_state.ex_gchandle *before* calling
 * mono_handle_exception_internal (). That call runs the managed catch/finally search,
 * which can trigger a GC or a nested LLVM finally resume that installs its own
 * ex_gchandle. Keeping the handle alive across the call (and freeing it only afterwards)
 * ensures ex_obj stays rooted, and clearing the field first avoids accidentally freeing a
 * newly-installed handle from a nested resume.
 */
	MonoGCHandle ex_gchandle = jit_tls->resume_state.ex_gchandle;
	jit_tls->resume_state.ex_gchandle = NULL;

	MonoObject *ex_obj = ex_gchandle ? mono_gchandle_get_target_internal (ex_gchandle) : NULL;

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

	if (ex_gchandle)
 mono_gchandle_free_internal (ex_gchandle);

	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 numberDiff line numberDiff 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;
	int first_filter_idx, filter_idx;
	/* MonoMethodILState */
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-maccatalyst.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-v8a-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/armv7-none-linux-androideabi.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,1168)
DECL_SIZE2(MonoJitTlsData,1164)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -258,16 +258,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,56)
DECL_OFFSET2(MonoJitTlsData,resume_state,264)
DECL_OFFSET2(MonoJitTlsData,handler_block,712)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,720)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,928)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1140)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1144)
DECL_OFFSET2(MonoJitTlsData,calling_image,1148)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1152)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1156)
DECL_OFFSET2(MonoJitTlsData,interp_context,1160)
DECL_OFFSET2(MonoJitTlsData,handler_block,708)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,716)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,924)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1132)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1140)
DECL_OFFSET2(MonoJitTlsData,calling_image,1144)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1148)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1152)
DECL_OFFSET2(MonoJitTlsData,interp_context,1156)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/i686-none-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,296)
DECL_SIZE2(MonoJitTlsData,292)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -259,16 +259,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,88)
DECL_OFFSET2(MonoJitTlsData,handler_block,192)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,196)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,232)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,268)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,272)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,276)
DECL_OFFSET2(MonoJitTlsData,calling_image,280)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,284)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,288)
DECL_OFFSET2(MonoJitTlsData,interp_context,292)
DECL_OFFSET2(MonoJitTlsData,handler_block,188)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,192)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,228)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,264)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,268)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,272)
DECL_OFFSET2(MonoJitTlsData,calling_image,276)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,280)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,284)
DECL_OFFSET2(MonoJitTlsData,interp_context,288)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-none.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-wasip2.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/x86_64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,2240)
DECL_SIZE2(MonoJitTlsData,2232)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -252,16 +252,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,496)
DECL_OFFSET2(MonoJitTlsData,handler_block,1360)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1376)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1776)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2184)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2192)
DECL_OFFSET2(MonoJitTlsData,calling_image,2200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2208)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2216)
DECL_OFFSET2(MonoJitTlsData,interp_context,2224)
DECL_OFFSET2(MonoJitTlsData,handler_block,1352)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1368)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1768)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2168)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2184)
DECL_OFFSET2(MonoJitTlsData,calling_image,2192)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2208)
DECL_OFFSET2(MonoJitTlsData,interp_context,2216)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all commits
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


7 changes: 7 additions & 0 deletions
eng/pipelines/runtime-llvm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ pr:
 - src/mono/mono/mini/decompose.c
 - src/mono/mono/mini/method-to-ir.c
 - src/mono/mono/mini/mini.c
 - src/mono/mono/mini/mini-amd64*.*
 - src/mono/mono/mini/mini-arm64*.*
 - src/mono/mono/mini/mini-arm*.*
 - src/mono/mono/mini/mini-riscv*.*
 - src/mono/mono/mini/mini-exceptions.*
 - src/mono/mono/mini/exceptions-*.*
 - src/mono/mono/mini/mini-runtime.*

variables:
 - template: /eng/pipelines/common/variables.yml
Expand Down

41 changes: 37 additions & 4 deletions
src/mono/mono/mini/mini-exceptions.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2498,8 +2498,16 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
 * methods, then execute the clause and the rest of the method
 * using the interpreter.
 */
 g_assert (!jit_tls->resume_state.ex_gchandle);
 jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal ((MonoObject*)obj, TRUE);
 /*
 * resume_state.ex_gchandle is shared with the finally-resume path
 * (mono_handle_exception_internal above). If a finally handler threw a
 * superseding exception that is now being caught here, that path left a
 * handle behind that will never be resumed; free it instead of
 * asserting, mirroring the finally path.
 */
 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 ((MonoObject*)obj, FALSE);
 jit_tls->resume_state.ji = ji;
 jit_tls->resume_state.clause_index = i;
 jit_tls->resume_state.il_state = frame.il_state;
Expand DownExpand Up@@ -2560,7 +2568,16 @@ 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 GC handle. The handler can reach a GC
 * safepoint, and a moving GC would otherwise collect the exception
 * (or invalidate a raw pointer stored here); the handle keeps it
 * alive and tracks relocation (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, FALSE);
 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 DownExpand Up@@ -3095,7 +3112,23 @@ 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);
	/*
 * Copy the GC handle to a local and clear resume_state.ex_gchandle *before* calling
 * mono_handle_exception_internal (). That call runs the managed catch/finally search,
 * which can trigger a GC or a nested LLVM finally resume that installs its own
 * ex_gchandle. Keeping the handle alive across the call (and freeing it only afterwards)
 * ensures ex_obj stays rooted, and clearing the field first avoids accidentally freeing a
 * newly-installed handle from a nested resume.
 */
	MonoGCHandle ex_gchandle = jit_tls->resume_state.ex_gchandle;
	jit_tls->resume_state.ex_gchandle = NULL;

	MonoObject *ex_obj = ex_gchandle ? mono_gchandle_get_target_internal (ex_gchandle) : NULL;

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

	if (ex_gchandle)
 mono_gchandle_free_internal (ex_gchandle);

	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 numberDiff line numberDiff 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;
	int first_filter_idx, filter_idx;
	/* MonoMethodILState */
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-maccatalyst.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-v8a-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/armv7-none-linux-androideabi.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,1168)
DECL_SIZE2(MonoJitTlsData,1164)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -258,16 +258,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,56)
DECL_OFFSET2(MonoJitTlsData,resume_state,264)
DECL_OFFSET2(MonoJitTlsData,handler_block,712)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,720)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,928)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1140)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1144)
DECL_OFFSET2(MonoJitTlsData,calling_image,1148)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1152)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1156)
DECL_OFFSET2(MonoJitTlsData,interp_context,1160)
DECL_OFFSET2(MonoJitTlsData,handler_block,708)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,716)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,924)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1132)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1140)
DECL_OFFSET2(MonoJitTlsData,calling_image,1144)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1148)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1152)
DECL_OFFSET2(MonoJitTlsData,interp_context,1156)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/i686-none-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,296)
DECL_SIZE2(MonoJitTlsData,292)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -259,16 +259,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,88)
DECL_OFFSET2(MonoJitTlsData,handler_block,192)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,196)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,232)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,268)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,272)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,276)
DECL_OFFSET2(MonoJitTlsData,calling_image,280)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,284)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,288)
DECL_OFFSET2(MonoJitTlsData,interp_context,292)
DECL_OFFSET2(MonoJitTlsData,handler_block,188)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,192)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,228)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,264)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,268)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,272)
DECL_OFFSET2(MonoJitTlsData,calling_image,276)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,280)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,284)
DECL_OFFSET2(MonoJitTlsData,interp_context,288)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-none.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-wasip2.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/x86_64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,2240)
DECL_SIZE2(MonoJitTlsData,2232)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -252,16 +252,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,496)
DECL_OFFSET2(MonoJitTlsData,handler_block,1360)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1376)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1776)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2184)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2192)
DECL_OFFSET2(MonoJitTlsData,calling_image,2200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2208)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2216)
DECL_OFFSET2(MonoJitTlsData,interp_context,2224)
DECL_OFFSET2(MonoJitTlsData,handler_block,1352)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1368)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1768)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2168)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2184)
DECL_OFFSET2(MonoJitTlsData,calling_image,2192)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2208)
DECL_OFFSET2(MonoJitTlsData,interp_context,2216)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all commits
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


7 changes: 7 additions & 0 deletions
eng/pipelines/runtime-llvm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ pr:
 - src/mono/mono/mini/decompose.c
 - src/mono/mono/mini/method-to-ir.c
 - src/mono/mono/mini/mini.c
 - src/mono/mono/mini/mini-amd64*.*
 - src/mono/mono/mini/mini-arm64*.*
 - src/mono/mono/mini/mini-arm*.*
 - src/mono/mono/mini/mini-riscv*.*
 - src/mono/mono/mini/mini-exceptions.*
 - src/mono/mono/mini/exceptions-*.*
 - src/mono/mono/mini/mini-runtime.*

variables:
 - template: /eng/pipelines/common/variables.yml
Expand Down

41 changes: 37 additions & 4 deletions
src/mono/mono/mini/mini-exceptions.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2498,8 +2498,16 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
 * methods, then execute the clause and the rest of the method
 * using the interpreter.
 */
 g_assert (!jit_tls->resume_state.ex_gchandle);
 jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal ((MonoObject*)obj, TRUE);
 /*
 * resume_state.ex_gchandle is shared with the finally-resume path
 * (mono_handle_exception_internal above). If a finally handler threw a
 * superseding exception that is now being caught here, that path left a
 * handle behind that will never be resumed; free it instead of
 * asserting, mirroring the finally path.
 */
 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 ((MonoObject*)obj, FALSE);
 jit_tls->resume_state.ji = ji;
 jit_tls->resume_state.clause_index = i;
 jit_tls->resume_state.il_state = frame.il_state;
Expand DownExpand Up@@ -2560,7 +2568,16 @@ 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 GC handle. The handler can reach a GC
 * safepoint, and a moving GC would otherwise collect the exception
 * (or invalidate a raw pointer stored here); the handle keeps it
 * alive and tracks relocation (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, FALSE);
 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 DownExpand Up@@ -3095,7 +3112,23 @@ 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);
	/*
 * Copy the GC handle to a local and clear resume_state.ex_gchandle *before* calling
 * mono_handle_exception_internal (). That call runs the managed catch/finally search,
 * which can trigger a GC or a nested LLVM finally resume that installs its own
 * ex_gchandle. Keeping the handle alive across the call (and freeing it only afterwards)
 * ensures ex_obj stays rooted, and clearing the field first avoids accidentally freeing a
 * newly-installed handle from a nested resume.
 */
	MonoGCHandle ex_gchandle = jit_tls->resume_state.ex_gchandle;
	jit_tls->resume_state.ex_gchandle = NULL;

	MonoObject *ex_obj = ex_gchandle ? mono_gchandle_get_target_internal (ex_gchandle) : NULL;

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

	if (ex_gchandle)
 mono_gchandle_free_internal (ex_gchandle);

	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 numberDiff line numberDiff 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;
	int first_filter_idx, filter_idx;
	/* MonoMethodILState */
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-maccatalyst.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-v8a-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/armv7-none-linux-androideabi.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,1168)
DECL_SIZE2(MonoJitTlsData,1164)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -258,16 +258,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,56)
DECL_OFFSET2(MonoJitTlsData,resume_state,264)
DECL_OFFSET2(MonoJitTlsData,handler_block,712)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,720)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,928)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1140)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1144)
DECL_OFFSET2(MonoJitTlsData,calling_image,1148)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1152)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1156)
DECL_OFFSET2(MonoJitTlsData,interp_context,1160)
DECL_OFFSET2(MonoJitTlsData,handler_block,708)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,716)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,924)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1132)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1140)
DECL_OFFSET2(MonoJitTlsData,calling_image,1144)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1148)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1152)
DECL_OFFSET2(MonoJitTlsData,interp_context,1156)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/i686-none-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,296)
DECL_SIZE2(MonoJitTlsData,292)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -259,16 +259,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,88)
DECL_OFFSET2(MonoJitTlsData,handler_block,192)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,196)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,232)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,268)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,272)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,276)
DECL_OFFSET2(MonoJitTlsData,calling_image,280)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,284)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,288)
DECL_OFFSET2(MonoJitTlsData,interp_context,292)
DECL_OFFSET2(MonoJitTlsData,handler_block,188)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,192)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,228)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,264)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,268)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,272)
DECL_OFFSET2(MonoJitTlsData,calling_image,276)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,280)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,284)
DECL_OFFSET2(MonoJitTlsData,interp_context,288)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-none.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-wasip2.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/x86_64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,2240)
DECL_SIZE2(MonoJitTlsData,2232)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -252,16 +252,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,496)
DECL_OFFSET2(MonoJitTlsData,handler_block,1360)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1376)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1776)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2184)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2192)
DECL_OFFSET2(MonoJitTlsData,calling_image,2200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2208)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2216)
DECL_OFFSET2(MonoJitTlsData,interp_context,2224)
DECL_OFFSET2(MonoJitTlsData,handler_block,1352)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1368)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1768)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2168)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2184)
DECL_OFFSET2(MonoJitTlsData,calling_image,2192)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2208)
DECL_OFFSET2(MonoJitTlsData,interp_context,2216)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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 all commits
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


7 changes: 7 additions & 0 deletions
eng/pipelines/runtime-llvm.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ pr:
 - src/mono/mono/mini/decompose.c
 - src/mono/mono/mini/method-to-ir.c
 - src/mono/mono/mini/mini.c
 - src/mono/mono/mini/mini-amd64*.*
 - src/mono/mono/mini/mini-arm64*.*
 - src/mono/mono/mini/mini-arm*.*
 - src/mono/mono/mini/mini-riscv*.*
 - src/mono/mono/mini/mini-exceptions.*
 - src/mono/mono/mini/exceptions-*.*
 - src/mono/mono/mini/mini-runtime.*

variables:
 - template: /eng/pipelines/common/variables.yml
Expand Down

41 changes: 37 additions & 4 deletions
src/mono/mono/mini/mini-exceptions.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2498,8 +2498,16 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
 * methods, then execute the clause and the rest of the method
 * using the interpreter.
 */
 g_assert (!jit_tls->resume_state.ex_gchandle);
 jit_tls->resume_state.ex_gchandle = mono_gchandle_new_internal ((MonoObject*)obj, TRUE);
 /*
 * resume_state.ex_gchandle is shared with the finally-resume path
 * (mono_handle_exception_internal above). If a finally handler threw a
 * superseding exception that is now being caught here, that path left a
 * handle behind that will never be resumed; free it instead of
 * asserting, mirroring the finally path.
 */
 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 ((MonoObject*)obj, FALSE);
 jit_tls->resume_state.ji = ji;
 jit_tls->resume_state.clause_index = i;
 jit_tls->resume_state.il_state = frame.il_state;
Expand DownExpand Up@@ -2560,7 +2568,16 @@ 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 GC handle. The handler can reach a GC
 * safepoint, and a moving GC would otherwise collect the exception
 * (or invalidate a raw pointer stored here); the handle keeps it
 * alive and tracks relocation (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, FALSE);
 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 DownExpand Up@@ -3095,7 +3112,23 @@ 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);
	/*
 * Copy the GC handle to a local and clear resume_state.ex_gchandle *before* calling
 * mono_handle_exception_internal (). That call runs the managed catch/finally search,
 * which can trigger a GC or a nested LLVM finally resume that installs its own
 * ex_gchandle. Keeping the handle alive across the call (and freeing it only afterwards)
 * ensures ex_obj stays rooted, and clearing the field first avoids accidentally freeing a
 * newly-installed handle from a nested resume.
 */
	MonoGCHandle ex_gchandle = jit_tls->resume_state.ex_gchandle;
	jit_tls->resume_state.ex_gchandle = NULL;

	MonoObject *ex_obj = ex_gchandle ? mono_gchandle_get_target_internal (ex_gchandle) : NULL;

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

	if (ex_gchandle)
 mono_gchandle_free_internal (ex_gchandle);

	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 numberDiff line numberDiff 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;
	int first_filter_idx, filter_idx;
	/* MonoMethodILState */
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-apple-maccatalyst.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/aarch64-v8a-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -240,7 +240,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,4160)
DECL_SIZE2(MonoJitTlsData,4152)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -254,16 +254,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,880)
DECL_OFFSET2(MonoJitTlsData,handler_block,2512)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2528)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3312)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4104)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4112)
DECL_OFFSET2(MonoJitTlsData,calling_image,4120)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4128)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4136)
DECL_OFFSET2(MonoJitTlsData,interp_context,4144)
DECL_OFFSET2(MonoJitTlsData,handler_block,2504)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,2520)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,3304)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,4088)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,4096)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,4104)
DECL_OFFSET2(MonoJitTlsData,calling_image,4112)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,4120)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,4128)
DECL_OFFSET2(MonoJitTlsData,interp_context,4136)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/armv7-none-linux-androideabi.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,1168)
DECL_SIZE2(MonoJitTlsData,1164)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -258,16 +258,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,56)
DECL_OFFSET2(MonoJitTlsData,resume_state,264)
DECL_OFFSET2(MonoJitTlsData,handler_block,712)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,720)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,928)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1140)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1144)
DECL_OFFSET2(MonoJitTlsData,calling_image,1148)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1152)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1156)
DECL_OFFSET2(MonoJitTlsData,interp_context,1160)
DECL_OFFSET2(MonoJitTlsData,handler_block,708)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,716)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,924)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,1132)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,1136)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,1140)
DECL_OFFSET2(MonoJitTlsData,calling_image,1144)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,1148)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,1152)
DECL_OFFSET2(MonoJitTlsData,interp_context,1156)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/i686-none-linux-android.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,296)
DECL_SIZE2(MonoJitTlsData,292)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -259,16 +259,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,88)
DECL_OFFSET2(MonoJitTlsData,handler_block,192)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,196)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,232)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,268)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,272)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,276)
DECL_OFFSET2(MonoJitTlsData,calling_image,280)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,284)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,288)
DECL_OFFSET2(MonoJitTlsData,interp_context,292)
DECL_OFFSET2(MonoJitTlsData,handler_block,188)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,192)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,228)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,264)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,268)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,272)
DECL_OFFSET2(MonoJitTlsData,calling_image,276)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,280)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,284)
DECL_OFFSET2(MonoJitTlsData,interp_context,288)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-none.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/wasm32-unknown-wasip2.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,7 +239,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,4)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,12)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,16)
DECL_SIZE2(MonoJitTlsData,216)
DECL_SIZE2(MonoJitTlsData,212)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,4)
DECL_OFFSET2(MonoJitTlsData,lmf,8)
Expand All@@ -253,16 +253,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,44)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,48)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,52)
DECL_OFFSET2(MonoJitTlsData,resume_state,72)
DECL_OFFSET2(MonoJitTlsData,handler_block,144)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,148)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,168)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,188)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,192)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,196)
DECL_OFFSET2(MonoJitTlsData,calling_image,200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,204)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,208)
DECL_OFFSET2(MonoJitTlsData,interp_context,212)
DECL_OFFSET2(MonoJitTlsData,handler_block,140)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,144)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,164)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,184)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,188)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,192)
DECL_OFFSET2(MonoJitTlsData,calling_image,196)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,204)
DECL_OFFSET2(MonoJitTlsData,interp_context,208)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,4)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,4)
Expand Down

22 changes: 11 additions & 11 deletions
src/mono/mono/offsets/x86_64-apple-darwin10.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ DECL_OFFSET2(MonoMethodRuntimeGenericContext,method,8)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,method_inst,16)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,entries,24)
DECL_OFFSET2(MonoMethodRuntimeGenericContext,infos,32)
DECL_SIZE2(MonoJitTlsData,2240)
DECL_SIZE2(MonoJitTlsData,2232)
DECL_OFFSET2(MonoJitTlsData,end_of_stack,0)
DECL_OFFSET2(MonoJitTlsData,stack_size,8)
DECL_OFFSET2(MonoJitTlsData,lmf,16)
Expand All@@ -252,16 +252,16 @@ DECL_OFFSET2(MonoJitTlsData,class_cast_from,80)
DECL_OFFSET2(MonoJitTlsData,class_cast_to,88)
DECL_OFFSET2(MonoJitTlsData,ex_ctx,96)
DECL_OFFSET2(MonoJitTlsData,resume_state,496)
DECL_OFFSET2(MonoJitTlsData,handler_block,1360)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1376)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1776)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2184)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2192)
DECL_OFFSET2(MonoJitTlsData,calling_image,2200)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2208)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2216)
DECL_OFFSET2(MonoJitTlsData,interp_context,2224)
DECL_OFFSET2(MonoJitTlsData,handler_block,1352)
DECL_OFFSET2(MonoJitTlsData,handler_block_context,1368)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx,1768)
DECL_OFFSET2(MonoJitTlsData,orig_ex_ctx_set,2168)
DECL_OFFSET2(MonoJitTlsData,thrown_exc,2176)
DECL_OFFSET2(MonoJitTlsData,thrown_non_exc,2184)
DECL_OFFSET2(MonoJitTlsData,calling_image,2192)
DECL_OFFSET2(MonoJitTlsData,abort_exc_stack_threshold,2200)
DECL_OFFSET2(MonoJitTlsData,active_jit_methods,2208)
DECL_OFFSET2(MonoJitTlsData,interp_context,2216)
DECL_SIZE2(MonoGSharedVtMethodRuntimeInfo,8)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,locals_size,0)
DECL_OFFSET2(MonoGSharedVtMethodRuntimeInfo,entries,8)
Expand Down
Loading
Loading