diff --git a/src/mono/mono/mini/debugger-agent-stubs.c b/src/mono/mono/mini/debugger-agent-stubs.c index 98054f84ce0220..539f454f044d36 100644 --- a/src/mono/mono/mini/debugger-agent-stubs.c +++ b/src/mono/mono/mini/debugger-agent-stubs.c @@ -73,12 +73,6 @@ stub_debugger_agent_debug_log_is_enabled (void) return FALSE; } -static void -stub_debugger_agent_unhandled_exception (MonoException *exc) -{ - g_assert_not_reached (); -} - static void stub_debugger_agent_single_step_from_context (MonoContext *ctx) { @@ -110,7 +104,6 @@ mono_debugger_agent_stub_init (void) cbs.single_step_from_context = stub_debugger_agent_single_step_from_context; cbs.breakpoint_from_context = stub_debugger_agent_breakpoint_from_context; cbs.free_domain_info = stub_debugger_agent_free_domain_info; - cbs.unhandled_exception = stub_debugger_agent_unhandled_exception; cbs.handle_exception = stub_debugger_agent_handle_exception; cbs.begin_exception_filter = stub_debugger_agent_begin_exception_filter; cbs.end_exception_filter = stub_debugger_agent_end_exception_filter; diff --git a/src/mono/mono/mini/debugger-agent.c b/src/mono/mono/mini/debugger-agent.c index 780332672fc68f..edbda4577a42fd 100644 --- a/src/mono/mono/mini/debugger-agent.c +++ b/src/mono/mono/mini/debugger-agent.c @@ -5289,26 +5289,6 @@ debugger_agent_debug_log_is_enabled (void) return agent_config.enabled; } -static void -debugger_agent_unhandled_exception (MonoException *exc) -{ - int suspend_policy; - GSList *events; - EventInfo ei; - - if (!inited) - return; - - memset (&ei, 0, sizeof (ei)); - ei.exc = (MonoObject*)exc; - - mono_loader_lock (); - events = create_event_list (EVENT_KIND_EXCEPTION, NULL, NULL, &ei, &suspend_policy); - mono_loader_unlock (); - - process_event (EVENT_KIND_EXCEPTION, &ei, 0, NULL, events, suspend_policy); -} - static void debugger_agent_handle_exception (MonoException *exc, MonoContext *throw_ctx, MonoContext *catch_ctx, StackFrameInfo *catch_frame) @@ -10423,7 +10403,6 @@ mono_debugger_agent_init (void) cbs.single_step_from_context = debugger_agent_single_step_from_context; cbs.breakpoint_from_context = debugger_agent_breakpoint_from_context; cbs.free_domain_info = debugger_agent_free_domain_info; - cbs.unhandled_exception = debugger_agent_unhandled_exception; cbs.handle_exception = debugger_agent_handle_exception; cbs.begin_exception_filter = debugger_agent_begin_exception_filter; cbs.end_exception_filter = debugger_agent_end_exception_filter; diff --git a/src/mono/mono/mini/debugger-agent.h b/src/mono/mono/mini/debugger-agent.h index 9081890596110a..750e5248f2483c 100644 --- a/src/mono/mono/mini/debugger-agent.h +++ b/src/mono/mono/mini/debugger-agent.h @@ -21,7 +21,6 @@ struct _MonoDebuggerCallbacks { void (*single_step_from_context) (MonoContext *ctx); void (*breakpoint_from_context) (MonoContext *ctx); void (*free_domain_info) (MonoDomain *domain); - void (*unhandled_exception) (MonoException *exc); void (*handle_exception) (MonoException *exc, MonoContext *throw_ctx, MonoContext *catch_ctx, StackFrameInfo *catch_frame); void (*begin_exception_filter) (MonoException *exc, MonoContext *ctx, MonoContext *orig_ctx); diff --git a/src/mono/mono/mini/mini-runtime.c b/src/mono/mono/mini/mini-runtime.c index 403e1beef85df1..26e274a85e8b7f 100644 --- a/src/mono/mono/mini/mini-runtime.c +++ b/src/mono/mono/mini/mini-runtime.c @@ -4656,11 +4656,6 @@ register_icalls (void) mono_add_internal_call_internal ("Mono.Runtime::mono_runtime_cleanup_handlers", mono_runtime_cleanup_handlers); -#if defined(HOST_ANDROID) || defined(TARGET_ANDROID) - mono_add_internal_call_internal ("System.Diagnostics.Debugger::Mono_UnhandledException_internal", - mini_get_dbg_callbacks ()->unhandled_exception); -#endif - /* * It's important that we pass `TRUE` as the last argument here, as * it causes the JIT to omit a wrapper for these icalls. If the JIT