Skip to content

[NativeAOT] Adjust SSP to match RSP of the throw site #119167

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
merged 1 commit into from
Aug 28, 2025
Merged

[NativeAOT] Adjust SSP to match RSP of the throw site #119167

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
8 changes: 8 additions & 0 deletions src/coreclr/nativeaot/Runtime/amd64/ExceptionHandling.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@ NESTED_ENTRY RhpThrowEx, _TEXT

alloc_stack SIZEOF_XmmSaves + 8h ;; reserve stack for the xmm saves (+8h to realign stack)
rdsspq r8 ;; nop if SSP is not implemented, 0 if not enabled
test r8, r8
je @f
add r8, 8 ;; Move SSP to match RSP of the throw site
@@:
push_vol_reg r8 ;; SSP
xor r8, r8
push_nonvol_reg r15
Expand Down Expand Up @@ -226,6 +230,10 @@ NESTED_ENTRY RhpRethrow, _TEXT

alloc_stack SIZEOF_XmmSaves + 8h ;; reserve stack for the xmm saves (+8h to realign stack)
rdsspq r8 ;; nop if SSP is not implemented, 0 if not enabled
test r8, r8
je @f
add r8, 8 ;; Move SSP to match RSP of the throw site
@@:
push_vol_reg r8 ;; SSP
xor r8, r8
push_nonvol_reg r15
Expand Down
7 changes: 0 additions & 7 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,13 +1024,6 @@
</ExcludeList>
</ItemGroup>

<!-- NativeAOT ControlFlowGuard specific -->
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(ControlFlowGuard)' == 'Guard'">
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b425314/b425314/**">
<Issue>https://github.com/dotnet/runtime/issues/107418</Issue>
</ExcludeList>
</ItemGroup>

<!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down
Loading