diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2021-05-21 15:53:21 -0700 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@google.com> | 2021-05-21 15:53:30 -0700 |
| commit | 033138ea452f5f493fb5095e5963419905ad12e1 (patch) | |
| tree | cc4bb3cf5aa64b9a508d8e879f217d079a429185 /llvm/lib/CodeGen/StackProtector.cpp | |
| parent | ab3cd2601bac99b26952c6f1015387d60800d2e2 (diff) | |
| download | llvm-033138ea452f5f493fb5095e5963419905ad12e1.zip llvm-033138ea452f5f493fb5095e5963419905ad12e1.tar.gz llvm-033138ea452f5f493fb5095e5963419905ad12e1.tar.bz2 | |
[IR] make stack-protector-guard-* flags into module attrs
D88631 added initial support for:
- -mstack-protector-guard=
- -mstack-protector-guard-reg=
- -mstack-protector-guard-offset=
flags, and D100919 extended these to AArch64. Unfortunately, these flags
aren't retained for LTO. Make them module attributes rather than
TargetOptions.
Link: https://github.com/ClangBuiltLinux/linux/issues/1378
Reviewed By: tejohnson
Differential Revision: https://reviews.llvm.org/D102742
Diffstat (limited to 'llvm/lib/CodeGen/StackProtector.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/StackProtector.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/StackProtector.cpp b/llvm/lib/CodeGen/StackProtector.cpp index ff6ff6d..9f229d5 100644 --- a/llvm/lib/CodeGen/StackProtector.cpp +++ b/llvm/lib/CodeGen/StackProtector.cpp @@ -380,9 +380,8 @@ static Value *getStackGuard(const TargetLoweringBase *TLI, Module *M, IRBuilder<> &B, bool *SupportsSelectionDAGSP = nullptr) { Value *Guard = TLI->getIRStackGuard(B); - auto GuardMode = TLI->getTargetMachine().Options.StackProtectorGuard; - if ((GuardMode == llvm::StackProtectorGuards::TLS || - GuardMode == llvm::StackProtectorGuards::None) && Guard) + StringRef GuardMode = M->getStackProtectorGuard(); + if ((GuardMode == "tls" || GuardMode.empty()) && Guard) return B.CreateLoad(B.getInt8PtrTy(), Guard, true, "StackGuard"); // Use SelectionDAG SSP handling, since there isn't an IR guard. |