Skip to content

Fix mono debugger thread block when wait for attach #62175

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
lambdageek merged 8 commits into from
Dec 2, 2021
Merged

Fix mono debugger thread block when wait for attach #62175

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ceac159
mono_runtime_delegate_invoke wrapper with MONO_ENTER_GC_UNSAFE/MONO_E…
srxqds Nov 24, 2021
a56b0cf
Update object.c
srxqds Nov 24, 2021
3de69c4
Merge branch 'dotnet:main' into main
srxqds Nov 24, 2021
5fcf23a
Merge branch 'dotnet:main' into main
srxqds Nov 29, 2021
2be859e
set debugger thread flags to MONO_THREAD_INFO_FLAGS_NO_GC | MONO_THRE…
srxqds Nov 30, 2021
60b19dc
wait_for_attach change to gc safe mode
srxqds Nov 30, 2021
07117d6
remove empty indent
srxqds Nov 30, 2021
b9d6083
change MONO_REQ_GC_SAFE_MODE to MONO_REQ_GC_UNSAFE_MODE
srxqds Nov 30, 2021
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
Next Next commit
mono_runtime_delegate_invoke wrapper with MONO_ENTER_GC_UNSAFE/MONO_E… 
…XIT_GC_UNSAFE;

mono_runtime_delegate_invoke wrapper with MONO_ENTER_GC_UNSAFE/MONO_EXIT_GC_UNSAFE;
  • Loading branch information
@srxqds
srxqds authored Nov 24, 2021
commit ceac1590dfeaefe8ca59cf5088e632958862d7e9
13 changes: 7 additions & 6 deletions src/mono/mono/metadata/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3714,24 +3714,25 @@ mono_get_delegate_end_invoke_checked (MonoClass *klass, MonoError *error)
MonoObject*
mono_runtime_delegate_invoke (MonoObject *delegate, void **params, MonoObject **exc)
{
MONO_REQ_GC_UNSAFE_MODE;

ERROR_DECL (error);
MonoObject* result = NULL;
MONO_ENTER_GC_UNSAFE;
if (exc) {
MonoObject *result = mono_runtime_delegate_try_invoke (delegate, params, exc, error);
result = mono_runtime_delegate_try_invoke (delegate, params, exc, error);
if (*exc) {
mono_error_cleanup (error);
return NULL;
result = NULL;
} else {
if (!is_ok (error))
*exc = (MonoObject*)mono_error_convert_to_exception (error);
return result;
}
} else {
MonoObject *result = mono_runtime_delegate_invoke_checked (delegate, params, error);
mono_error_raise_exception_deprecated (error); /* OK to throw, external only without a good alternative */
return result;

}
MONO_EXIT_GC_UNSAFE;
return result;
}

/**
Expand Down