nickdesaulniers updated this revision to Diff 346800. nickdesaulniers added a comment.
- fix lints Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102742/new/ https://reviews.llvm.org/D102742 Files: clang/include/clang/Driver/Options.td clang/lib/CodeGen/BackendUtil.cpp clang/lib/CodeGen/CodeGenModule.cpp clang/test/CodeGen/stack-protector-guard.c llvm/include/llvm/CodeGen/CommandFlags.h llvm/include/llvm/IR/Module.h llvm/include/llvm/Target/TargetOptions.h llvm/lib/CodeGen/CommandFlags.cpp llvm/lib/CodeGen/StackProtector.cpp llvm/lib/IR/Module.cpp llvm/lib/Target/AArch64/AArch64InstrInfo.cpp llvm/lib/Target/X86/X86ISelLowering.cpp llvm/test/CodeGen/AArch64/stack-guard-sysreg.ll llvm/test/CodeGen/X86/stack-protector-3.ll
Index: llvm/test/CodeGen/X86/stack-protector-3.ll =================================================================== --- llvm/test/CodeGen/X86/stack-protector-3.ll +++ llvm/test/CodeGen/X86/stack-protector-3.ll @@ -1,10 +1,18 @@ -; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %s | FileCheck --check-prefix=CHECK-TLS-FS-40 %s -; RUN: llc -mtriple=x86_64-pc-linux-gnu -stack-protector-guard=tls -o - < %s | FileCheck --check-prefix=CHECK-TLS-FS-40 %s -; RUN: llc -mtriple=x86_64-pc-linux-gnu -stack-protector-guard=global -o - < %s | FileCheck --check-prefix=CHECK-GLOBAL %s -; RUN: llc -mtriple=x86_64-pc-linux-gnu -stack-protector-guard-reg=fs -o - < %s | FileCheck --check-prefix=CHECK-TLS-FS-40 %s -; RUN: llc -mtriple=x86_64-pc-linux-gnu -stack-protector-guard-reg=gs -o - < %s | FileCheck --check-prefix=CHECK-GS %s -; RUN: llc -mtriple=x86_64-pc-linux-gnu -stack-protector-guard-offset=20 -o - < %s | FileCheck --check-prefix=CHECK-OFFSET %s -; RUN: llc -mtriple=x86_64-pc-linux-gnu -stack-protector-guard-offset=-20 -o - < %s | FileCheck --check-prefix=CHECK-NEGATIVE-OFFSET %s +; RUN: split-file %s %t +; RUN: cat %t/main.ll %t/a.ll > %t/a2.ll +; RUN: cat %t/main.ll %t/b.ll > %t/b2.ll +; RUN: cat %t/main.ll %t/c.ll > %t/c2.ll +; RUN: cat %t/main.ll %t/d.ll > %t/d2.ll +; RUN: cat %t/main.ll %t/e.ll > %t/e2.ll +; RUN: cat %t/main.ll %t/f.ll > %t/f2.ll +; RUN: cat %t/main.ll %t/g.ll > %t/g2.ll +; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/a2.ll | FileCheck --check-prefix=CHECK-TLS-FS-40 %s +; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/b2.ll | FileCheck --check-prefix=CHECK-TLS-FS-40 %s +; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/c2.ll | FileCheck --check-prefix=CHECK-GLOBAL %s +; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/d2.ll | FileCheck --check-prefix=CHECK-TLS-FS-40 %s +; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/e2.ll | FileCheck --check-prefix=CHECK-GS %s +; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/f2.ll | FileCheck --check-prefix=CHECK-OFFSET %s +; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/g2.ll | FileCheck --check-prefix=CHECK-NEGATIVE-OFFSET %s ; CHECK-TLS-FS-40: movq %fs:40, %rax ; CHECK-TLS-FS-40: movq %fs:40, %rax @@ -47,6 +55,8 @@ ; CHECK-GLOBAL-NEXT: .cfi_def_cfa_offset 32 ; CHECK-GLOBAL-NEXT: callq __stack_chk_fail +;--- main.ll + ; ModuleID = 't.c' @.str = private unnamed_addr constant [14 x i8] c"stackoverflow\00", align 1 @a = dso_local local_unnamed_addr global i8* null, align 8 @@ -75,3 +85,23 @@ attributes #0 = { nounwind sspreq uwtable writeonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="none" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" "unsafe-fp-math"="false" "use-soft-float"="false" } attributes #1 = { argmemonly nounwind willreturn } attributes #2 = { nounwind } + +;--- a.ll +;--- b.ll +!llvm.module.flags = !{!1} +!1 = !{i32 2, !"stack-protector-guard", !"tls"} +;--- c.ll +!llvm.module.flags = !{!1} +!1 = !{i32 2, !"stack-protector-guard", !"global"} +;--- d.ll +!llvm.module.flags = !{!1} +!1 = !{i32 2, !"stack-protector-guard-reg", !"fs"} +;--- e.ll +!llvm.module.flags = !{!1} +!1 = !{i32 2, !"stack-protector-guard-reg", !"gs"} +;--- f.ll +!llvm.module.flags = !{!1} +!1 = !{i32 2, !"stack-protector-guard-offset", i32 20} +;--- g.ll +!llvm.module.flags = !{!1} +!1 = !{i32 2, !"stack-protector-guard-offset", i32 -20} Index: llvm/test/CodeGen/AArch64/stack-guard-sysreg.ll =================================================================== --- llvm/test/CodeGen/AArch64/stack-guard-sysreg.ll +++ llvm/test/CodeGen/AArch64/stack-guard-sysreg.ll @@ -1,46 +1,39 @@ -; RUN: llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=0 -verify-machineinstrs -o - | \ +; RUN: split-file %s %t +; RUN: cat %t/main.ll %t/a.ll > %t/a2.ll +; RUN: cat %t/main.ll %t/b.ll > %t/b2.ll +; RUN: cat %t/main.ll %t/c.ll > %t/c2.ll +; RUN: cat %t/main.ll %t/d.ll > %t/d2.ll +; RUN: cat %t/main.ll %t/e.ll > %t/e2.ll +; RUN: cat %t/main.ll %t/f.ll > %t/f2.ll +; RUN: cat %t/main.ll %t/g.ll > %t/g2.ll +; RUN: cat %t/main.ll %t/h.ll > %t/h2.ll +; RUN: cat %t/main.ll %t/i.ll > %t/i2.ll +; RUN: cat %t/main.ll %t/j.ll > %t/j2.ll +; RUN: llc %t/a2.ll -verify-machineinstrs -o - | \ ; RUN: FileCheck --check-prefix=CHECK --check-prefix=CHECK-NO-OFFSET %s -; RUN: llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=8 -verify-machineinstrs -o - | \ +; RUN: llc %t/b2.ll -verify-machineinstrs -o - | \ ; RUN: FileCheck --check-prefix=CHECK --check-prefix=CHECK-POSITIVE-OFFSET %s -; RUN: llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=-8 -verify-machineinstrs -o - | \ +; RUN: llc %t/c2.ll -verify-machineinstrs -o - | \ ; RUN: FileCheck --check-prefix=CHECK --check-prefix=CHECK-NEGATIVE-OFFSET %s -; RUN: llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=1 -verify-machineinstrs -o - | \ +; RUN: llc %t/d2.ll -verify-machineinstrs -o - | \ ; RUN: FileCheck --check-prefix=CHECK --check-prefix=CHECK-NPOT-OFFSET %s -; RUN: llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=-1 -verify-machineinstrs -o - | \ +; RUN: llc %t/e2.ll -verify-machineinstrs -o - | \ ; RUN: FileCheck --check-prefix=CHECK --check-prefix=CHECK-NPOT-NEG-OFFSET %s -; RUN: llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=257 -verify-machineinstrs -o - | \ +; RUN: llc %t/f2.ll -verify-machineinstrs -o - | \ ; RUN: FileCheck --check-prefix=CHECK --check-prefix=CHECK-257-OFFSET %s -; RUN: llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=-257 -verify-machineinstrs -o - | \ +; RUN: llc %t/g2.ll -verify-machineinstrs -o - | \ ; RUN: FileCheck --check-prefix=CHECK --check-prefix=CHECK-MINUS-257-OFFSET %s ; XFAIL -; RUN: not --crash llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=32761 -o - 2>&1 | \ +; RUN: not --crash llc %t/h2.ll -o - 2>&1 | \ ; RUN: FileCheck --check-prefix=CHECK-BAD-OFFSET %s -; RUN: not --crash llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=-4096 -o - 2>&1 | \ +; RUN: not --crash llc %t/i2.ll -o - 2>&1 | \ ; RUN: FileCheck --check-prefix=CHECK-BAD-OFFSET %s -; RUN: not --crash llc %s --stack-protector-guard=sysreg \ -; RUN: --stack-protector-guard-reg=sp_el0 \ -; RUN: --stack-protector-guard-offset=4097 -o - 2>&1 | \ +; RUN: not --crash llc %t/j2.ll -o - 2>&1 | \ ; RUN: FileCheck --check-prefix=CHECK-BAD-OFFSET %s +;--- main.ll + target triple = "aarch64-unknown-linux-gnu" ; Verify that we `mrs` from `SP_EL0` twice, rather than load from @@ -100,6 +93,31 @@ declare void @baz(i32*) +; CHECK-BAD-OFFSET: LLVM ERROR: Unable to encode Stack Protector Guard Offset + attributes #0 = { sspstrong } +!llvm.module.flags = !{!1, !2, !3} -; CHECK-BAD-OFFSET: LLVM ERROR: Unable to encode Stack Protector Guard Offset +!1 = !{i32 2, !"stack-protector-guard", !"sysreg"} +!2 = !{i32 2, !"stack-protector-guard-reg", !"sp_el0"} + +;--- a.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 0} +;--- b.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 8} +;--- c.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 -8} +;--- d.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 1} +;--- e.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 -1} +;--- f.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 257} +;--- g.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 -257} +;--- h.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 32761} +;--- i.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 -4096} +;--- j.ll +!3 = !{i32 2, !"stack-protector-guard-offset", i32 4097} Index: llvm/lib/Target/X86/X86ISelLowering.cpp =================================================================== --- llvm/lib/Target/X86/X86ISelLowering.cpp +++ llvm/lib/Target/X86/X86ISelLowering.cpp @@ -2509,15 +2509,16 @@ return SegmentOffset(IRB, 0x10, getAddressSpace()); } else { unsigned AddressSpace = getAddressSpace(); + Module *M = IRB.GetInsertBlock()->getParent()->getParent(); // Specially, some users may customize the base reg and offset. - int Offset = getTargetMachine().Options.StackProtectorGuardOffset; + int Offset = M->getStackProtectorGuardOffset(); // If we don't set -stack-protector-guard-offset value: // %fs:0x28, unless we're using a Kernel code model, in which case // it's %gs:0x28. gs:0x14 on i386. if (Offset == INT_MAX) Offset = (Subtarget.is64Bit()) ? 0x28 : 0x14; - const auto &GuardReg = getTargetMachine().Options.StackProtectorGuardReg; + StringRef GuardReg = M->getStackProtectorGuardReg(); if (GuardReg == "fs") AddressSpace = X86AS::FS; else if (GuardReg == "gs") @@ -2547,12 +2548,11 @@ return; } - auto GuardMode = getTargetMachine().Options.StackProtectorGuard; + StringRef GuardMode = M.getStackProtectorGuard(); // glibc, bionic, and Fuchsia have a special slot for the stack guard. - if ((GuardMode == llvm::StackProtectorGuards::TLS || - GuardMode == llvm::StackProtectorGuards::None) - && hasStackGuardSlotTLS(Subtarget.getTargetTriple())) + if ((GuardMode == "tls" || GuardMode.empty()) && + hasStackGuardSlotTLS(Subtarget.getTargetTriple())) return; TargetLowering::insertSSPDeclarations(M); } Index: llvm/lib/Target/AArch64/AArch64InstrInfo.cpp =================================================================== --- llvm/lib/Target/AArch64/AArch64InstrInfo.cpp +++ llvm/lib/Target/AArch64/AArch64InstrInfo.cpp @@ -1904,10 +1904,10 @@ } Register Reg = MI.getOperand(0).getReg(); - TargetOptions Options = MI.getParent()->getParent()->getTarget().Options; - if (Options.StackProtectorGuard == StackProtectorGuards::SysReg) { + Module &M = *MBB.getParent()->getFunction().getParent(); + if (M.getStackProtectorGuard() == "sysreg") { const AArch64SysReg::SysReg *SrcReg = - AArch64SysReg::lookupSysRegByName(Options.StackProtectorGuardReg); + AArch64SysReg::lookupSysRegByName(M.getStackProtectorGuardReg()); if (!SrcReg) report_fatal_error("Unknown SysReg for Stack Protector Guard Register"); @@ -1915,7 +1915,7 @@ BuildMI(MBB, MI, DL, get(AArch64::MRS)) .addDef(Reg, RegState::Renamable) .addImm(SrcReg->Encoding); - int Offset = Options.StackProtectorGuardOffset; + int Offset = M.getStackProtectorGuardOffset(); if (Offset >= 0 && Offset <= 32760 && Offset % 8 == 0) { // ldr xN, [xN, #offset] BuildMI(MBB, MI, DL, get(AArch64::LDRXui)) Index: llvm/lib/IR/Module.cpp =================================================================== --- llvm/lib/IR/Module.cpp +++ llvm/lib/IR/Module.cpp @@ -686,6 +686,42 @@ addModuleFlag(ModFlagBehavior::Max, "frame-pointer", static_cast<int>(Kind)); } +StringRef Module::getStackProtectorGuard() const { + Metadata *MD = getModuleFlag("stack-protector-guard"); + if (auto *MDS = dyn_cast_or_null<MDString>(MD)) + return MDS->getString(); + return {}; +} + +void Module::setStackProtectorGuard(StringRef Kind) { + MDString *ID = MDString::get(getContext(), Kind); + addModuleFlag(ModFlagBehavior::Warning, "stack-protector-guard", ID); +} + +StringRef Module::getStackProtectorGuardReg() const { + Metadata *MD = getModuleFlag("stack-protector-guard-reg"); + if (auto *MDS = dyn_cast_or_null<MDString>(MD)) + return MDS->getString(); + return {}; +} + +void Module::setStackProtectorGuardReg(StringRef Reg) { + MDString *ID = MDString::get(getContext(), Reg); + addModuleFlag(ModFlagBehavior::Warning, "stack-protector-guard-reg", ID); +} + +int Module::getStackProtectorGuardOffset() const { + Metadata *MD = getModuleFlag("stack-protector-guard-offset"); + if (auto *CI = mdconst::dyn_extract_or_null<ConstantInt>(MD)) + return CI->getSExtValue(); + return INT_MAX; +} + +void Module::setStackProtectorGuardOffset(int Offset) { + addModuleFlag(ModFlagBehavior::Warning, "stack-protector-guard-offset", + Offset); +} + void Module::setSDKVersion(const VersionTuple &V) { SmallVector<unsigned, 3> Entries; Entries.push_back(V.getMajor()); Index: llvm/lib/CodeGen/StackProtector.cpp =================================================================== --- llvm/lib/CodeGen/StackProtector.cpp +++ llvm/lib/CodeGen/StackProtector.cpp @@ -380,9 +380,8 @@ 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. Index: llvm/lib/CodeGen/CommandFlags.cpp =================================================================== --- llvm/lib/CodeGen/CommandFlags.cpp +++ llvm/lib/CodeGen/CommandFlags.cpp @@ -79,9 +79,6 @@ CGOPT(bool, IgnoreXCOFFVisibility) CGOPT(bool, XCOFFTracebackTable) CGOPT(std::string, BBSections) -CGOPT(std::string, StackProtectorGuard) -CGOPT(int, StackProtectorGuardOffset) -CGOPT(std::string, StackProtectorGuardReg) CGOPT(unsigned, TLSSize) CGOPT(bool, EmulatedTLS) CGOPT(bool, UniqueSectionNames) @@ -366,21 +363,6 @@ cl::init("none")); CGBINDOPT(BBSections); - static cl::opt<std::string> StackProtectorGuard( - "stack-protector-guard", cl::desc("Stack protector guard mode"), - cl::init("none")); - CGBINDOPT(StackProtectorGuard); - - static cl::opt<std::string> StackProtectorGuardReg( - "stack-protector-guard-reg", cl::desc("Stack protector guard register"), - cl::init("none")); - CGBINDOPT(StackProtectorGuardReg); - - static cl::opt<int> StackProtectorGuardOffset( - "stack-protector-guard-offset", cl::desc("Stack protector guard offset"), - cl::init(INT_MAX)); - CGBINDOPT(StackProtectorGuardOffset); - static cl::opt<unsigned> TLSSize( "tls-size", cl::desc("Bit size of immediate TLS offsets"), cl::init(0)); CGBINDOPT(TLSSize); @@ -502,26 +484,6 @@ } } -llvm::StackProtectorGuards -codegen::getStackProtectorGuardMode(llvm::TargetOptions &Options) { - if (getStackProtectorGuard() == "tls") - return StackProtectorGuards::TLS; - if (getStackProtectorGuard() == "global") - return StackProtectorGuards::Global; - if (getStackProtectorGuard() == "sysreg") - return StackProtectorGuards::SysReg; - if (getStackProtectorGuard() != "none") { - ErrorOr<std::unique_ptr<MemoryBuffer>> MBOrErr = - MemoryBuffer::getFile(getStackProtectorGuard()); - if (!MBOrErr) - errs() << "error illegal stack protector guard mode: " - << MBOrErr.getError().message() << "\n"; - else - Options.BBSectionsFuncListBuf = std::move(*MBOrErr); - } - return StackProtectorGuards::None; -} - // Common utility function tightly tied to the options listed here. Initializes // a TargetOptions object with CodeGen flags and returns it. TargetOptions @@ -558,9 +520,6 @@ Options.BBSections = getBBSectionsMode(Options); Options.UniqueSectionNames = getUniqueSectionNames(); Options.UniqueBasicBlockSectionNames = getUniqueBasicBlockSectionNames(); - Options.StackProtectorGuard = getStackProtectorGuardMode(Options); - Options.StackProtectorGuardOffset = getStackProtectorGuardOffset(); - Options.StackProtectorGuardReg = getStackProtectorGuardReg(); Options.TLSSize = getTLSSize(); Options.EmulatedTLS = getEmulatedTLS(); Options.ExplicitEmulatedTLS = EmulatedTLSView->getNumOccurrences() > 0; Index: llvm/include/llvm/Target/TargetOptions.h =================================================================== --- llvm/include/llvm/Target/TargetOptions.h +++ llvm/include/llvm/Target/TargetOptions.h @@ -73,8 +73,6 @@ None // Do not use Basic Block Sections. }; - enum class StackProtectorGuards { None, TLS, Global, SysReg }; - enum class EABI { Unknown, Default, // Default means not specified @@ -328,16 +326,6 @@ /// By default, it is set to false. unsigned DebugStrictDwarf : 1; - /// Stack protector guard offset to use. - int StackProtectorGuardOffset = INT_MAX; - - /// Stack protector guard mode to use, e.g. tls, global, sysreg. - StackProtectorGuards StackProtectorGuard = - StackProtectorGuards::None; - - /// Stack protector guard reg to use, e.g. usually fs or gs in X86. - std::string StackProtectorGuardReg = "None"; - /// Name of the stack usage file (i.e., .su file) if user passes /// -fstack-usage. If empty, it can be implied that -fstack-usage is not /// passed on the command line. Index: llvm/include/llvm/IR/Module.h =================================================================== --- llvm/include/llvm/IR/Module.h +++ llvm/include/llvm/IR/Module.h @@ -895,6 +895,13 @@ FramePointerKind getFramePointer() const; void setFramePointer(FramePointerKind Kind); + StringRef getStackProtectorGuard() const; + void setStackProtectorGuard(StringRef Kind); + StringRef getStackProtectorGuardReg() const; + void setStackProtectorGuardReg(StringRef Reg); + int getStackProtectorGuardOffset() const; + void setStackProtectorGuardOffset(int Offset); + /// @name Utility functions for querying and setting the build SDK version /// @{ Index: llvm/include/llvm/CodeGen/CommandFlags.h =================================================================== --- llvm/include/llvm/CodeGen/CommandFlags.h +++ llvm/include/llvm/CodeGen/CommandFlags.h @@ -106,10 +106,6 @@ std::string getBBSections(); -std::string getStackProtectorGuard(); -int getStackProtectorGuardOffset(); -std::string getStackProtectorGuardReg(); - unsigned getTLSSize(); bool getEmulatedTLS(); @@ -150,9 +146,6 @@ llvm::BasicBlockSection getBBSectionsMode(llvm::TargetOptions &Options); -llvm::StackProtectorGuards -getStackProtectorGuardMode(llvm::TargetOptions &Options); - /// Common utility function tightly tied to the options listed here. Initializes /// a TargetOptions object with CodeGen flags and returns it. /// \p TheTriple is used to determine the default value for options if Index: clang/test/CodeGen/stack-protector-guard.c =================================================================== --- /dev/null +++ clang/test/CodeGen/stack-protector-guard.c @@ -0,0 +1,14 @@ +// RUN: %clang_cc1 -mstack-protector-guard=sysreg \ +// RUN: -mstack-protector-guard-reg=sp_el0 \ +// RUN: -mstack-protector-guard-offset=1024 \ +// RUN: -emit-llvm %s -o - | FileCheck %s +void foo(int*); +void bar(int x) { + int baz[x]; + foo(baz); +} + +// CHECK: !llvm.module.flags = !{{{.*}}[[ATTR1:![0-9]+]], [[ATTR2:![0-9]+]], [[ATTR3:![0-9]+]]} +// CHECK: [[ATTR1]] = !{i32 2, !"stack-protector-guard", !"sysreg"} +// CHECK: [[ATTR2]] = !{i32 2, !"stack-protector-guard-reg", !"sp_el0"} +// CHECK: [[ATTR3]] = !{i32 2, !"stack-protector-guard-offset", i32 1024} Index: clang/lib/CodeGen/CodeGenModule.cpp =================================================================== --- clang/lib/CodeGen/CodeGenModule.cpp +++ clang/lib/CodeGen/CodeGenModule.cpp @@ -773,6 +773,15 @@ if (!getCodeGenOpts().RecordCommandLine.empty()) EmitCommandLineMetadata(); + if (!getCodeGenOpts().StackProtectorGuard.empty()) + getModule().setStackProtectorGuard(getCodeGenOpts().StackProtectorGuard); + if (!getCodeGenOpts().StackProtectorGuardReg.empty()) + getModule().setStackProtectorGuardReg( + getCodeGenOpts().StackProtectorGuardReg); + if (getCodeGenOpts().StackProtectorGuardOffset != INT_MAX) + getModule().setStackProtectorGuardOffset( + getCodeGenOpts().StackProtectorGuardOffset); + getTargetCodeGenInfo().emitTargetMetadata(*this, MangledDeclNames); EmitBackendOptionsMetadata(getCodeGenOpts()); Index: clang/lib/CodeGen/BackendUtil.cpp =================================================================== --- clang/lib/CodeGen/BackendUtil.cpp +++ clang/lib/CodeGen/BackendUtil.cpp @@ -558,15 +558,6 @@ Options.UniqueSectionNames = CodeGenOpts.UniqueSectionNames; Options.UniqueBasicBlockSectionNames = CodeGenOpts.UniqueBasicBlockSectionNames; - Options.StackProtectorGuard = - llvm::StringSwitch<llvm::StackProtectorGuards>( - CodeGenOpts.StackProtectorGuard) - .Case("tls", llvm::StackProtectorGuards::TLS) - .Case("global", llvm::StackProtectorGuards::Global) - .Case("sysreg", llvm::StackProtectorGuards::SysReg) - .Default(llvm::StackProtectorGuards::None); - Options.StackProtectorGuardOffset = CodeGenOpts.StackProtectorGuardOffset; - Options.StackProtectorGuardReg = CodeGenOpts.StackProtectorGuardReg; Options.TLSSize = CodeGenOpts.TLSSize; Options.EmulatedTLS = CodeGenOpts.EmulatedTLS; Options.ExplicitEmulatedTLS = CodeGenOpts.ExplicitEmulatedTLS; Index: clang/include/clang/Driver/Options.td =================================================================== --- clang/include/clang/Driver/Options.td +++ clang/include/clang/Driver/Options.td @@ -3413,7 +3413,7 @@ MarshallingInfoInt<CodeGenOpts<"StackProtectorGuardOffset">, "INT_MAX", "int">; def mstack_protector_guard_reg_EQ : Joined<["-"], "mstack-protector-guard-reg=">, Group<m_Group>, Flags<[CC1Option]>, HelpText<"Use the given reg for addressing the stack-protector guard">, - MarshallingInfoString<CodeGenOpts<"StackProtectorGuardReg">, [{"none"}]>; + MarshallingInfoString<CodeGenOpts<"StackProtectorGuardReg">>; def mfentry : Flag<["-"], "mfentry">, HelpText<"Insert calls to fentry at function entry (x86/SystemZ only)">, Flags<[CC1Option]>, Group<m_Group>, MarshallingInfoFlag<CodeGenOpts<"CallFEntry">>;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits