Skip to content

Implement UnhandledException hook for finalizer scenario in Mono. #118563

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
VSadov merged 11 commits into from
Aug 19, 2025
Merged

Implement UnhandledException hook for finalizer scenario in Mono. #118563

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b7da99d
Implement UnhandledException hook for finalizers in Mono.
VSadov Aug 10, 2025
912699d
Cache the finalize method on wasm
VSadov Aug 11, 2025
4e4503b
Precompile invoke helper for GuardedFinalize
VSadov Aug 14, 2025
6fde69f
only check for GuardedFinalize in corlib
VSadov Aug 14, 2025
7fa39cb
make GuardedFinalize virtual
VSadov Aug 16, 2025
f7b8446
use mono_runtime_try_invoke, since we can wih instance methods
VSadov Aug 16, 2025
936bf4e
comment out unused
VSadov Aug 16, 2025
5ce3892
Move GuardedFinalize to a helper class
VSadov Aug 17, 2025
c1cc2b9
make it static
VSadov Aug 17, 2025
11b41d3
some cleanup
VSadov Aug 17, 2025
a6605c2
remove no longer relevant comment
VSadov Aug 18, 2025
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
Prev Previous commit
Next Next commit
Precompile invoke helper for GuardedFinalize
  • Loading branch information
@VSadov
VSadov committed Aug 15, 2025
commit 4e4503bebceff4e3fd2dc092cf3c14b2e32e0840
2 changes: 1 addition & 1 deletion src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4977,7 +4977,7 @@ add_full_aot_wrappers (MonoAotCompile *acfg)
add_method (acfg, get_runtime_invoke_sig (csig));

/* runtime-invoke used by finalizers */
add_method (acfg, get_runtime_invoke (acfg, get_method_nofail (mono_defaults.object_class, "GuardedFinalize", 0, 0), FALSE));
add_method (acfg, mono_marshal_get_runtime_invoke_full (get_method_nofail (mono_defaults.object_class, "GuardedFinalize", 0, 0), FALSE, TRUE));

/* This is used by mono_runtime_capture_context () */
method = mono_get_context_capture_method ();
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/mini-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5363,8 +5363,8 @@ mono_precompile_assembly (MonoAssembly *ass, void *user_data)
mono_error_cleanup (error); /* FIXME don't swallow the error */
continue;
}
if (strcmp (method->name, "Finalize") == 0) {
invoke = mono_marshal_get_runtime_invoke (method, FALSE);
if (strcmp (method->name, "GuardedFinalize") == 0) {
invoke = mono_marshal_get_runtime_invoke_full (method, FALSE, TRUE);
mono_compile_method_checked (invoke, error);
mono_error_assert_ok (error);
}
Expand Down