Skip to content

[debugger] Revert Removing unhandled_exception which was used for android #40027

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
thaystg merged 1 commit into from
Jul 28, 2020
Merged

[debugger] Revert Removing unhandled_exception which was used for android #40027

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/mono/mono/mini/debugger-agent-stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ 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)
{
Expand Down Expand Up @@ -104,6 +110,7 @@ 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;
Expand Down
21 changes: 21 additions & 0 deletions src/mono/mono/mini/debugger-agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5286,6 +5286,26 @@ 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)
Expand Down Expand Up @@ -10400,6 +10420,7 @@ 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;
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/debugger-agent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ 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);
Expand Down
11 changes: 2 additions & 9 deletions src/mono/mono/mini/mini-exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,15 +2366,8 @@ handle_exception_first_pass (MonoContext *ctx, MonoObject *obj, gint32 *out_filt
if (method->wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED && ftnptr_eh_callback) {
result = MONO_FIRST_PASS_CALLBACK_TO_NATIVE;
}

#if defined(HOST_ANDROID) || defined(TARGET_ANDROID)
//ignore the try catch in the .. icall_wrapper call
if (method->wrapper_type == WRAPPER_SUBTYPE_ICALL_WRAPPER) {
*ctx = new_ctx;
continue;
}
#endif



for (i = clause_index_start; i < ji->num_clauses; i++) {
MonoJitExceptionInfo *ei = &ji->clauses [i];
gboolean filtered = FALSE;
Expand Down
5 changes: 5 additions & 0 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 @@ -4646,6 +4646,11 @@ 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
Expand Down