Skip to content

Fix invalid continuation caused by exception after inlining in TryRunInline #115659

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
stephentoub merged 16 commits into from
Jun 2, 2025
Merged

Fix invalid continuation caused by exception after inlining in TryRunInline #115659

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0c4b3c4
Fix inline taskQueued check and add interrupt test
kotlarmilos May 16, 2025
7bc160c
Add missing using System.Linq
kotlarmilos May 16, 2025
8cf5016
Add thread.Join()
kotlarmilos May 16, 2025
8928a94
Update exception handling logic
kotlarmilos May 17, 2025
376eb7c
Update src/libraries/System.Private.CoreLib/src/System/Threading/Task…
kotlarmilos May 21, 2025
76665e2
Reduce attempts and fix condition
kotlarmilos May 21, 2025
548520f
Merge branch 'main' into bugfix/inline-task-exception
stephentoub May 28, 2025
e763981
Include platform-specific conditions
kotlarmilos May 28, 2025
44f49d4
Fix test condition
kotlarmilos May 29, 2025
c46e45e
Add IsNotDebugRuntime property
kotlarmilos May 29, 2025
812f365
Test OSX platform
kotlarmilos May 29, 2025
cadb833
Test OSX Release build
kotlarmilos May 29, 2025
d9b7ed6
Check for ReleaseLibrary before execution
kotlarmilos May 30, 2025
c910579
Test condition
kotlarmilos May 30, 2025
c190b75
Remove inline task interrupt test
kotlarmilos Jun 2, 2025
0882044
Remove unused System.Linq namespace
kotlarmilos Jun 2, 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
3 changes: 2 additions & 1 deletion src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,8 @@ internal void InternalRunSynchronously(TaskScheduler scheduler, bool waitForComp
// to the guideline that an exception implies that no state change took place),
// so it is safe to catch the exception and move the task to a final state. The
// same cannot be said for Wait()/WaitAll()/FastWaitAll().
if (!scheduler.TryRunInline(this, false))
taskQueued = scheduler.TryRunInline(this, false);
if (!taskQueued)
{
scheduler.InternalQueueTask(this);
taskQueued = true; // only mark this after successfully queuing the task.
Expand Down