Skip to content
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

Fix ThreadAbort on Unix and reenable the related tests #73399

Merged
merged 5 commits into from
Aug 6, 2022
Merged

Fix ThreadAbort on Unix and reenable the related tests #73399

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcc622d
Fix ThreadAbort on Unix and reenable the related tests
janvorli Aug 3, 2022
e02cef2
Remove Console.WriteLine calls from the test methods
janvorli Aug 4, 2022
8de15f8
Fix build on non-amd64 windows
janvorli Aug 4, 2022
1948901
Fix thread abort on Alpine Linux
janvorli Aug 5, 2022
bae3963
Added forgotten inlining disabling for the InvokeActivationHandler
janvorli Aug 6, 2022
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
5 changes: 0 additions & 5 deletions src/coreclr/System.Private.CoreLib/src/System/Runtime/ControlledExecution.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ public static partial class ControlledExecution
[Obsolete(Obsoletions.ControlledExecutionRunMessage, DiagnosticId = Obsoletions.ControlledExecutionRunDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
public static void Run(Action action, CancellationToken cancellationToken)
{
if (!OperatingSystem.IsWindows())
{
throw new PlatformNotSupportedException();
}

ArgumentNullException.ThrowIfNull(action);

// ControlledExecution.Run does not support nested invocations. If there's one already in flight
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/vm/threads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3837,7 +3837,7 @@ class Thread
#endif
}

void UnmarkRedirectContextInUse(PTR_CONTEXT pCtx)
bool UnmarkRedirectContextInUse(PTR_CONTEXT pCtx)
{
LIMITED_METHOD_CONTRACT;
#ifdef _DEBUG
Expand All @@ -3848,6 +3848,7 @@ class Thread
m_RedirectContextInUse = false;
}
#endif
return (pCtx == m_pSavedRedirectContext);
}
VSadov marked this conversation as resolved.
Show resolved Hide resolved
#endif //DACCESS_COMPILE

Expand Down
Loading