[llvm] Revert 86b1b0671cafd "MachineVerifier: Check stack protector is top-most in frame" (PR #122444)
Simon Pilgrim via llvm-commits
llvm-commits at lists.llvm.org
Fri Jan 10 04:10:33 PST 2025
https://github.com/RKSimon created https://github.com/llvm/llvm-project/pull/122444
Reverts llvm/llvm-project#121481
This is causing build failures on EXPENSIVE_CHECKS builds:
https://lab.llvm.org/buildbot/#/builders/187/builds/3653
https://lab.llvm.org/buildbot/#/builders/16/builds/11758
>From d211d6502646a0b2bf88c265586c937aafacb53e Mon Sep 17 00:00:00 2001
From: Simon Pilgrim <git at redking.me.uk>
Date: Fri, 10 Jan 2025 12:09:29 +0000
Subject: [PATCH] Revert "MachineVerifier: Check stack protector is top-most in
frame (#121481)"
This reverts commit 86b1b0671cafd462c0aa681e2d320ce597300f69.
---
llvm/lib/CodeGen/MachineVerifier.cpp | 52 +--------------
.../stack-protector-offset.mir | 63 -------------------
2 files changed, 1 insertion(+), 114 deletions(-)
delete mode 100644 llvm/test/MachineVerifier/stack-protector-offset.mir
diff --git a/llvm/lib/CodeGen/MachineVerifier.cpp b/llvm/lib/CodeGen/MachineVerifier.cpp
index 2558799c19f4d8..bec36b728ae328 100644
--- a/llvm/lib/CodeGen/MachineVerifier.cpp
+++ b/llvm/lib/CodeGen/MachineVerifier.cpp
@@ -353,8 +353,6 @@ struct MachineVerifier {
LaneBitmask LaneMask = LaneBitmask::getNone());
void verifyStackFrame();
- // Check that the stack protector is the top-most object in the stack.
- void verifyStackProtector();
void verifySlotIndexes() const;
void verifyProperties(const MachineFunction &MF);
@@ -711,10 +709,8 @@ void MachineVerifier::visitMachineFunctionBefore() {
// Check that the register use lists are sane.
MRI->verifyUseLists();
- if (!MF->empty()) {
+ if (!MF->empty())
verifyStackFrame();
- verifyStackProtector();
- }
}
void
@@ -4042,49 +4038,3 @@ void MachineVerifier::verifyStackFrame() {
}
}
}
-
-void MachineVerifier::verifyStackProtector() {
- const MachineFrameInfo &MFI = MF->getFrameInfo();
- if (!MFI.hasStackProtectorIndex())
- return;
- // Only applicable when the offsets of frame objects have been determined,
- // which is indicated by a non-zero stack size.
- if (!MFI.getStackSize())
- return;
- const TargetFrameLowering &TFI = *MF->getSubtarget().getFrameLowering();
- bool StackGrowsDown =
- TFI.getStackGrowthDirection() == TargetFrameLowering::StackGrowsDown;
- // Collect the frame indices of the callee-saved registers which are spilled
- // to the stack. These are the registers that are stored above the stack
- // protector.
- SmallSet<unsigned, 4> CalleeSavedFrameIndices;
- if (MFI.isCalleeSavedInfoValid()) {
- for (const CalleeSavedInfo &Info : MFI.getCalleeSavedInfo()) {
- if (!Info.isSpilledToReg())
- CalleeSavedFrameIndices.insert(Info.getFrameIdx());
- }
- }
- unsigned FI = MFI.getStackProtectorIndex();
- int64_t SPStart = MFI.getObjectOffset(FI);
- int64_t SPEnd = SPStart + MFI.getObjectSize(FI);
- for (unsigned I = 0, E = MFI.getObjectIndexEnd(); I != E; ++I) {
- if (I == FI)
- continue;
- // Variable-sized objects do not have a fixed offset.
- if (MFI.isVariableSizedObjectIndex(I))
- continue;
- if (CalleeSavedFrameIndices.contains(I))
- continue;
- int64_t ObjStart = MFI.getObjectOffset(I);
- int64_t ObjEnd = ObjStart + MFI.getObjectSize(I);
- if (SPStart < ObjEnd && ObjStart < SPEnd) {
- report("Stack protector overlaps with another stack object", MF);
- break;
- }
- if ((StackGrowsDown && SPStart <= ObjStart) ||
- (!StackGrowsDown && SPStart >= ObjStart)) {
- report("Stack protector is not the top-most object on the stack", MF);
- break;
- }
- }
-}
diff --git a/llvm/test/MachineVerifier/stack-protector-offset.mir b/llvm/test/MachineVerifier/stack-protector-offset.mir
deleted file mode 100644
index 47008e1b123546..00000000000000
--- a/llvm/test/MachineVerifier/stack-protector-offset.mir
+++ /dev/null
@@ -1,63 +0,0 @@
-# REQUIRES: aarch64-registered-target, amdgpu-registered-target
-
-# RUN: split-file %s %t
-
-# RUN: llc -mtriple=aarch64 -run-pass=none -o - %t/valid.mir
-# RUN: not --crash llc -mtriple=aarch64 -run-pass=none -o - %t/lower.mir 2>&1 | FileCheck %t/lower.mir
-# RUN: not --crash llc -mtriple=aarch64 -run-pass=none -o - %t/overlap.mir 2>&1 | FileCheck %t/overlap.mir
-# RUN: not --crash llc -mtriple=amdgcn -run-pass=none -o - %t/higher.mir 2>&1 | FileCheck %t/higher.mir
-
-;--- valid.mir
----
-name: valid
-frameInfo:
- stackSize: 16
- stackProtector: '%stack.1'
-stack:
- - { id: 0, offset: -24, size: 8, alignment: 8, stack-id: default }
- - { id: 1, offset: -16, size: 8, alignment: 8, stack-id: default }
-body: |
- bb.0:
-...
-
-;--- lower.mir
-# CHECK: *** Bad machine code: Stack protector is not the top-most object on the stack ***
----
-name: lower
-frameInfo:
- stackSize: 16
- stackProtector: '%stack.1'
-stack:
- - { id: 0, offset: -16, size: 8, alignment: 8, stack-id: default }
- - { id: 1, offset: -24, size: 8, alignment: 8, stack-id: default }
-body: |
- bb.0:
-...
-
-;--- overlap.mir
-# CHECK: *** Bad machine code: Stack protector overlaps with another stack object ***
----
-name: overlap
-frameInfo:
- stackSize: 16
- stackProtector: '%stack.1'
-stack:
- - { id: 0, offset: -20, size: 8, alignment: 4, stack-id: default }
- - { id: 1, offset: -16, size: 8, alignment: 8, stack-id: default }
-body: |
- bb.0:
-...
-
-;--- higher.mir
-# CHECK: *** Bad machine code: Stack protector is not the top-most object on the stack ***
----
-name: higher
-frameInfo:
- stackSize: 16
- stackProtector: '%stack.1'
-stack:
- - { id: 0, offset: 16, size: 8, alignment: 8, stack-id: default }
- - { id: 1, offset: 24, size: 8, alignment: 8, stack-id: default }
-body: |
- bb.0:
-...
More information about the llvm-commits
mailing list