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 fast tail calls on Windows ARM64. #37192

Merged
merged 1 commit into from
May 30, 2020
+3 −9
Merged

Fix fast tail calls on Windows ARM64. #37192

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
6 changes: 3 additions & 3 deletions src/coreclr/src/jit/lower.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1870,7 +1870,7 @@ void Lowering::LowerFastTailCall(GenTreeCall* call)

unsigned int overwrittenStart = put->getArgOffset();
unsigned int overwrittenEnd = overwrittenStart + put->getArgSize();
#if !(defined(TARGET_WINDOWS) && defined(TARGET_64BIT))
#if !(defined(TARGET_WINDOWS) && defined(TARGET_AMD64))
int baseOff = -1; // Stack offset of first arg on stack
#endif

Expand All @@ -1883,8 +1883,8 @@ void Lowering::LowerFastTailCall(GenTreeCall* call)
continue;
}

#if defined(TARGET_WINDOWS) && defined(TARGET_64BIT)
// On Win64, the argument position determines the stack slot uniquely, and even the
#if defined(TARGET_WINDOWS) && defined(TARGET_AMD64)
// On Windows x64, the argument position determines the stack slot uniquely, and even the
// register args take up space in the stack frame (shadow space).
unsigned int argStart = callerArgLclNum * TARGET_POINTER_SIZE;
unsigned int argEnd = argStart + static_cast<unsigned int>(callerArgDsc->lvArgStackSize());
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,12 +599,6 @@
<ExcludeList Include="$(XunitTestBinBase)/JIT/opt/Tailcall/TailcallVerifyWithPrefix/*">
<Issue>Condition17::Test1 checks that we tail call via helper when security cookie is needed; on arm64 we fast tail call in this case.</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Stress/ABI/tailcalls_d/*">
<Issue>https://github.com/dotnet/runtime/issues/31729</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Stress/ABI/tailcalls_do/*">
<Issue>https://github.com/dotnet/runtime/issues/31729</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/dev10bugs/536168/536168/*">
<Issue>extremely memory/time intensive test</Issue>
</ExcludeList>
Expand Down