[llvm] [CodeGen] Inline stack guard check on Windows (PR #136290)
Eli Friedman via llvm-commits
llvm-commits at lists.llvm.org
Thu Jun 5 17:52:59 PDT 2025
================
@@ -3126,14 +3132,69 @@ void SelectionDAGBuilder::visitSPDescriptorParent(StackProtectorDescriptor &SPD,
/// For a high level explanation of how this fits into the stack protector
/// generation see the comment on the declaration of class
/// StackProtectorDescriptor.
-void
-SelectionDAGBuilder::visitSPDescriptorFailure(StackProtectorDescriptor &SPD) {
+void SelectionDAGBuilder::visitSPDescriptorFailure(
+ StackProtectorDescriptor &SPD) {
+
const TargetLowering &TLI = DAG.getTargetLoweringInfo();
- TargetLowering::MakeLibCallOptions CallOptions;
- CallOptions.setDiscardResult(true);
- SDValue Chain = TLI.makeLibCall(DAG, RTLIB::STACKPROTECTOR_CHECK_FAIL,
- MVT::isVoid, {}, CallOptions, getCurSDLoc())
- .second;
+ MachineBasicBlock *ParentBB = SPD.getParentMBB();
+ const Module &M = *ParentBB->getParent()->getFunction().getParent();
+ SDValue Chain;
+
+ // For -Oz builds with a guard check function, we use function-based
+ // instrumentation. Otherwise, if we have a guard check function, we call it
+ // in the failure block.
+ auto *GuardCheckFn = TLI.getSSPStackGuardCheck(M);
+ if (GuardCheckFn && !SPD.shouldEmitFunctionBasedCheckStackProtector()) {
+ // First create the loads to the guard/stack slot for the comparison.
+ auto &DL = DAG.getDataLayout();
+ EVT PtrTy = TLI.getFrameIndexTy(DL);
+ EVT PtrMemTy = TLI.getPointerMemTy(DL);
----------------
efriedma-quic wrote:
```suggestion
EVT PtrMemTy = TLI.getPointerMemTy(DL, DL.getAllocaAddrSpace());
```
https://github.com/llvm/llvm-project/pull/136290
More information about the llvm-commits
mailing list