diff options
author | John Brawn <john.brawn@arm.com> | 2021-12-14 11:11:41 +0000 |
---|---|---|
committer | John Brawn <john.brawn@arm.com> | 2021-12-14 11:30:48 +0000 |
commit | dc9f65be4555406262ff693c8bac5f1f0b960a97 (patch) | |
tree | 9a573354ee3c2edc13b08a26eb1e68b28843a836 /llvm/lib/CodeGen/LocalStackSlotAllocation.cpp | |
parent | b81450afb6529cd4d1eece46e9945caa5de51c11 (diff) | |
download | llvm-dc9f65be4555406262ff693c8bac5f1f0b960a97.zip llvm-dc9f65be4555406262ff693c8bac5f1f0b960a97.tar.gz llvm-dc9f65be4555406262ff693c8bac5f1f0b960a97.tar.bz2 |
[AArch64][SVE] Fix handling of stack protection with SVE
Fix a couple of things that were causing stack protection to not work
correctly in functions that have scalable vectors on the stack:
* Use TypeSize when determining if accesses to a variable are
considered out-of-bounds so that the behaviour is correct for
scalable vectors.
* When stack protection is enabled move the stack protector location
to the top of the SVE locals, so that any overflow in them (or the
other locals which are below that) will be detected.
Fixes: https://github.com/llvm/llvm-project/issues/51137
Differential Revision: https://reviews.llvm.org/D111631
Diffstat (limited to 'llvm/lib/CodeGen/LocalStackSlotAllocation.cpp')
-rw-r--r-- | llvm/lib/CodeGen/LocalStackSlotAllocation.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp b/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp index ee2387d..37fd3e4 100644 --- a/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp +++ b/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp @@ -210,7 +210,11 @@ void LocalStackSlotPass::calculateFrameObjectOffsets(MachineFunction &Fn) { StackObjSet SmallArrayObjs; StackObjSet AddrOfObjs; - AdjustStackOffset(MFI, StackProtectorFI, Offset, StackGrowsDown, MaxAlign); + // Only place the stack protector in the local stack area if the target + // allows it. + if (TFI.isStackIdSafeForLocalArea(MFI.getStackID(StackProtectorFI))) + AdjustStackOffset(MFI, StackProtectorFI, Offset, StackGrowsDown, + MaxAlign); // Assign large stack objects first. for (unsigned i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i) { |