Skip to content

Do not adjust wasm virtual IPs in the thread abort stack walk #135915

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
jkotas merged 3 commits into from
Oct 19, 2026
Merged

Do not adjust wasm virtual IPs in the thread abort stack walk #135915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6f97fd
Preserve wasm virtual IPs in abort stack walks
pcshrosbree Oct 16, 2026
6026fff
Run thread-independent ControlledExecution tests
pcshrosbree Oct 16, 2026
e61138f
Merge branch 'main' into fix/wasm-ta-virtual-ip
jkotas Oct 19, 2026
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
8 changes: 7 additions & 1 deletion src/coreclr/vm/threadsuspend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,13 @@ static StackWalkAction TAStackCrawlCallBackWorker(CrawlFrame* pCf, StackCrawlCon
// we can't use it to directly compare against the EH ranges because we
// may be in an cloned finally which has a call as the last instruction.

offs--;
#ifdef TARGET_WASM
// On Wasm, R2R code with virtual ips should not have its ip adjusted
if (!ExecutionManager::IsVirtualIP(GetControlPC(pCf->GetRegisterSet())))
#endif
{
offs--;
}
}

if (pData->fWriteToStressLog)
Expand Down
9 changes: 4 additions & 5 deletions ...ries/System.Runtime/tests/System.Runtime.Tests/System/Runtime/ControlledExecutionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

namespace System.Runtime.Tests
{
[ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsMultithreadingSupported))]
public sealed class ControlledExecutionTests
{
private volatile bool _readyForCancellation;
Expand Down Expand Up @@ -54,7 +53,7 @@ void Test()

// Tests that an infinite loop may be aborted and that the ThreadAbortException is translated
// to an OperationCanceledException.
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoRuntime), nameof(PlatformDetection.IsNotNativeAot))]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoRuntime), nameof(PlatformDetection.IsNotNativeAot), nameof(PlatformDetection.IsMultithreadingSupported))]
public void CancelOutsideOfTryCatchFinally()
{
var cts = new CancellationTokenSource();
Expand Down Expand Up @@ -103,7 +102,7 @@ void Test()
}

// Tests that catch blocks are not aborted. The catch block swallows the ThreadAbortException and throws a different exception.
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoRuntime), nameof(PlatformDetection.IsNotNativeAot))]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoRuntime), nameof(PlatformDetection.IsNotNativeAot), nameof(PlatformDetection.IsMultithreadingSupported))]
public void CancelInTryAndThrowFromCatch()
{
var cts = new CancellationTokenSource();
Expand Down Expand Up @@ -131,7 +130,7 @@ void Test()
}

// Tests that finally blocks are not aborted. The finally block exits normally.
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoRuntime), nameof(PlatformDetection.IsNotNativeAot))]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoRuntime), nameof(PlatformDetection.IsNotNativeAot), nameof(PlatformDetection.IsMultithreadingSupported))]
public void CancelInFinallyThatSleeps()
{
var cts = new CancellationTokenSource();
Expand Down Expand Up @@ -160,7 +159,7 @@ void Test()
}

// Tests that finally blocks are not aborted. The finally block throws an exception.
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoRuntime), nameof(PlatformDetection.IsNotNativeAot))]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoRuntime), nameof(PlatformDetection.IsNotNativeAot), nameof(PlatformDetection.IsMultithreadingSupported))]
public void CancelInFinallyThatSleepsAndThrows()
{
var cts = new CancellationTokenSource();
Expand Down
Loading