Author: Xiang1 Zhang Date: 2022-07-12T10:14:32+08:00 New Revision: 643786213b34c7bd971c14db63dfbae8bb979997
URL: https://github.com/llvm/llvm-project/commit/643786213b34c7bd971c14db63dfbae8bb979997 DIFF: https://github.com/llvm/llvm-project/commit/643786213b34c7bd971c14db63dfbae8bb979997.diff LOG: Revert "[X86] Support -mstack-protector-guard-symbol" This reverts commit efbaad1c4a526e91b034e56386e98a9268cd87b2. due to miss adding review info. Added: Modified: clang/docs/ClangCommandLineReference.rst clang/docs/ReleaseNotes.rst clang/include/clang/Basic/CodeGenOptions.h clang/include/clang/Driver/Options.td clang/lib/CodeGen/CodeGenModule.cpp clang/lib/Driver/ToolChains/Clang.cpp clang/test/Driver/stack-protector-guard.c llvm/docs/ReleaseNotes.rst llvm/include/llvm/IR/Module.h llvm/lib/IR/Module.cpp llvm/lib/Target/X86/X86ISelLowering.cpp llvm/test/CodeGen/X86/stack-protector-3.ll Removed: ################################################################################ diff --git a/clang/docs/ClangCommandLineReference.rst b/clang/docs/ClangCommandLineReference.rst index 129e70d8e3f22..ae110df4148d8 100644 --- a/clang/docs/ClangCommandLineReference.rst +++ b/clang/docs/ClangCommandLineReference.rst @@ -3285,10 +3285,6 @@ Use the given offset for addressing the stack-protector guard Use the given reg for addressing the stack-protector guard -.. option:: -mstack-protector-guard-symbol=<arg> - -Use the given symbol for addressing the stack-protector guard - .. option:: -mstack-protector-guard=<arg> Use the given guard (global, tls) for addressing the stack-protector guard diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 86b9b7ef471bb..27ba4f1c6a422 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -548,8 +548,6 @@ X86 Support in Clang - Added the ``-m[no-]rdpru`` flag to enable/disable the RDPRU instruction provided by AMD Zen2 and later processors. Defined intrinsics for using this instruction (see rdpruintrin.h). -- Support ``-mstack-protector-guard-symbol=[SymbolName]`` to use the given - symbol for addressing the stack protector guard. DWARF Support in Clang ---------------------- diff --git a/clang/include/clang/Basic/CodeGenOptions.h b/clang/include/clang/Basic/CodeGenOptions.h index cd204e5d7c150..23d76c308d847 100644 --- a/clang/include/clang/Basic/CodeGenOptions.h +++ b/clang/include/clang/Basic/CodeGenOptions.h @@ -389,9 +389,6 @@ class CodeGenOptions : public CodeGenOptionsBase { /// On AArch64 this can only be "sp_el0". std::string StackProtectorGuardReg; - /// Specify a symbol to be the guard value. - std::string StackProtectorGuardSymbol; - /// Path to ignorelist file specifying which objects /// (files, functions) listed for instrumentation by sanitizer /// coverage pass should actually not be instrumented. diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index a1329e7532540..8ae9145a271a5 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -3771,9 +3771,6 @@ def mstack_protector_guard_EQ : Joined<["-"], "mstack-protector-guard=">, Group< def mstack_protector_guard_offset_EQ : Joined<["-"], "mstack-protector-guard-offset=">, Group<m_Group>, Flags<[CC1Option]>, HelpText<"Use the given offset for addressing the stack-protector guard">, MarshallingInfoInt<CodeGenOpts<"StackProtectorGuardOffset">, "INT_MAX", "int">; -def mstack_protector_guard_symbol_EQ : Joined<["-"], "mstack-protector-guard-symbol=">, Group<m_Group>, Flags<[CC1Option]>, - HelpText<"Use the given symbol for addressing the stack-protector guard">, - MarshallingInfoString<CodeGenOpts<"StackProtectorGuardSymbol">>; 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">>; diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index cf954b7b9277e..56ed59d1e3f15 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -900,9 +900,6 @@ void CodeGenModule::Release() { if (!getCodeGenOpts().StackProtectorGuardReg.empty()) getModule().setStackProtectorGuardReg( getCodeGenOpts().StackProtectorGuardReg); - if (!getCodeGenOpts().StackProtectorGuardSymbol.empty()) - getModule().setStackProtectorGuardSymbol( - getCodeGenOpts().StackProtectorGuardSymbol); if (getCodeGenOpts().StackProtectorGuardOffset != INT_MAX) getModule().setStackProtectorGuardOffset( getCodeGenOpts().StackProtectorGuardOffset); diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index ec1a31fa71d55..aae416f19fbd5 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -3231,16 +3231,6 @@ static void RenderAnalyzerOptions(const ArgList &Args, ArgStringList &CmdArgs, Args.AddAllArgValues(CmdArgs, options::OPT_Xanalyzer); } -static bool isValidSymbolName(StringRef S) { - if (S.empty()) - return false; - - if (std::isdigit(S[0])) - return false; - - return llvm::all_of(S, [](char C) { return std::isalnum(C) || C == '_'; }); -} - static void RenderSSPOptions(const Driver &D, const ToolChain &TC, const ArgList &Args, ArgStringList &CmdArgs, bool KernelOrKext) { @@ -3372,16 +3362,6 @@ static void RenderSSPOptions(const Driver &D, const ToolChain &TC, } A->render(Args, CmdArgs); } - - if (Arg *A = Args.getLastArg(options::OPT_mstack_protector_guard_symbol_EQ)) { - StringRef Value = A->getValue(); - if (!isValidSymbolName(Value)) { - D.Diag(diag::err_drv_argument_only_allowed_with) - << A->getOption().getName() << "legal symbol name"; - return; - } - A->render(Args, CmdArgs); - } } static void RenderSCPOptions(const ToolChain &TC, const ArgList &Args, diff --git a/clang/test/Driver/stack-protector-guard.c b/clang/test/Driver/stack-protector-guard.c index de8776bd7c59d..2c215b1995967 100644 --- a/clang/test/Driver/stack-protector-guard.c +++ b/clang/test/Driver/stack-protector-guard.c @@ -13,8 +13,6 @@ // RUN: FileCheck -check-prefix=CHECK-FS %s // RUN: %clang -### -target x86_64-unknown-unknown -mstack-protector-guard-reg=gs %s 2>&1 | \ // RUN: FileCheck -check-prefix=CHECK-GS %s -// RUN: %clang -### -target x86_64-unknown-unknown -mstack-protector-guard-symbol=sym %s 2>&1 | \ -// RUN: FileCheck -check-prefix=CHECK-SYM %s // Invalid arch // RUN: not %clang -target powerpc64le-linux-gnu -mstack-protector-guard=tls %s 2>&1 | \ @@ -34,16 +32,10 @@ // RUN: FileCheck -check-prefix=INVALID-REG %s // RUN: not %clang -target x86_64-unknown-unknown -c -mstack-protector-guard-reg=ds %s 2>&1 | \ // RUN: FileCheck -check-prefix=INVALID-REG %s -// RUN: not %clang -target x86_64-unknown-unknown -c -mstack-protector-guard-symbol=2s %s 2>&1 | \ -// RUN: FileCheck -check-prefix=INVALID-SYM %s -// RUN: not %clang -target x86_64-unknown-unknown -c -mstack-protector-guard-symbol= %s 2>&1 | \ -// RUN: FileCheck -check-prefix=INVALID-SYM %s // CHECK-FS: "-cc1" {{.*}}"-mstack-protector-guard-reg=fs" // CHECK-GS: "-cc1" {{.*}}"-mstack-protector-guard-reg=gs" // INVALID-REG: error: invalid value {{.*}} in 'mstack-protector-guard-reg=', expected one of: fs gs -// CHECK-SYM: "-cc1" {{.*}}"-mstack-protector-guard-symbol=sym" -// INVALID-SYM: error: invalid argument 'mstack-protector-guard-symbol=' only allowed with 'legal symbol name' // RUN: not %clang -target arm-eabi-c -mstack-protector-guard=tls %s 2>&1 | \ // RUN: FileCheck -check-prefix=MISSING-OFFSET %s diff --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst index 03d964ece6064..1268cc71c9b54 100644 --- a/llvm/docs/ReleaseNotes.rst +++ b/llvm/docs/ReleaseNotes.rst @@ -221,12 +221,6 @@ Changes to the DAG infrastructure --------------------------------- -Changes to the Metadata Info ---------------------------------- - -* Add Module Flags Metadata ``stack-protector-guard-symbol`` which specify a - symbol for addressing the stack-protector guard. - Changes to the Debug Info --------------------------------- diff --git a/llvm/include/llvm/IR/Module.h b/llvm/include/llvm/IR/Module.h index 24da08d70b726..fc2d609471187 100644 --- a/llvm/include/llvm/IR/Module.h +++ b/llvm/include/llvm/IR/Module.h @@ -911,10 +911,6 @@ class LLVM_EXTERNAL_VISIBILITY Module { StringRef getStackProtectorGuardReg() const; void setStackProtectorGuardReg(StringRef Reg); - /// Get/set a symbol to use as the stack protector guard. - StringRef getStackProtectorGuardSymbol() const; - void setStackProtectorGuardSymbol(StringRef Symbol); - /// Get/set what offset from the stack protector to use. int getStackProtectorGuardOffset() const; void setStackProtectorGuardOffset(int Offset); diff --git a/llvm/lib/IR/Module.cpp b/llvm/lib/IR/Module.cpp index b51ea45f651a1..5cd74d53da757 100644 --- a/llvm/lib/IR/Module.cpp +++ b/llvm/lib/IR/Module.cpp @@ -714,18 +714,6 @@ void Module::setStackProtectorGuardReg(StringRef Reg) { addModuleFlag(ModFlagBehavior::Error, "stack-protector-guard-reg", ID); } -StringRef Module::getStackProtectorGuardSymbol() const { - Metadata *MD = getModuleFlag("stack-protector-guard-symbol"); - if (auto *MDS = dyn_cast_or_null<MDString>(MD)) - return MDS->getString(); - return {}; -} - -void Module::setStackProtectorGuardSymbol(StringRef Symbol) { - MDString *ID = MDString::get(getContext(), Symbol); - addModuleFlag(ModFlagBehavior::Error, "stack-protector-guard-symbol", ID); -} - int Module::getStackProtectorGuardOffset() const { Metadata *MD = getModuleFlag("stack-protector-guard-offset"); if (auto *CI = mdconst::dyn_extract_or_null<ConstantInt>(MD)) diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 6dc823f7b5e0e..047ac0d3b5b1e 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -2845,21 +2845,6 @@ Value *X86TargetLowering::getIRStackGuard(IRBuilderBase &IRB) const { AddressSpace = X86AS::FS; else if (GuardReg == "gs") AddressSpace = X86AS::GS; - - // Use symbol guard if user specify. - StringRef GuardSymb = M->getStackProtectorGuardSymbol(); - if (!GuardSymb.empty()) { - GlobalVariable *GV = M->getGlobalVariable(GuardSymb); - if (!GV) { - Type *Ty = Subtarget.is64Bit() ? Type::getInt64Ty(M->getContext()) - : Type::getInt32Ty(M->getContext()); - GV = new GlobalVariable(*M, Ty, false, GlobalValue::ExternalLinkage, - nullptr, GuardSymb, nullptr, - GlobalValue::NotThreadLocal, AddressSpace); - } - return GV; - } - return SegmentOffset(IRB, Offset, AddressSpace); } } diff --git a/llvm/test/CodeGen/X86/stack-protector-3.ll b/llvm/test/CodeGen/X86/stack-protector-3.ll index 59f583b043802..82e115702d5ae 100644 --- a/llvm/test/CodeGen/X86/stack-protector-3.ll +++ b/llvm/test/CodeGen/X86/stack-protector-3.ll @@ -6,8 +6,6 @@ ; 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/existedGV.ll %t/main.ll %t/h.ll > %t/i2.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 @@ -15,8 +13,8 @@ ; 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 -; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/h2.ll | FileCheck --check-prefix=CHECK-SYM %s -; RUN: llc -mtriple=x86_64-pc-linux-gnu -o - < %t/i2.ll | FileCheck --check-prefix=CHECK-SYMGV %s + +;--- main.ll ; CHECK-TLS-FS-40: movq %fs:40, %rax ; CHECK-TLS-FS-40: movq %fs:40, %rax @@ -59,31 +57,7 @@ ; CHECK-GLOBAL-NEXT: .cfi_def_cfa_offset 32 ; CHECK-GLOBAL-NEXT: callq __stack_chk_fail -; CHECK-SYM: movq __woof@GOTPCREL(%rip), %rax -; CHECK-SYM-NEXT: movq %fs:(%rax), %rcx -; CHECK-SYM-NEXT: movq %rcx, 16(%rsp) -; CHECK-SYM: movq %fs:(%rax), %rax -; CHECK-SYM-NEXT: cmpq 16(%rsp), %rax -; CHECK-SYM-NEXT: jne .LBB0_2 -; CHECK-SYM: .LBB0_2: -; CHECK-SYM-NEXT: .cfi_def_cfa_offset 32 -; CHECK-SYM-NEXT: callq __stack_chk_fai - -; CHECK-SYMGV: movq __woof(%rip), %rax -; CHECK-SYMGV-NEXT: movq %rax, 16(%rsp) -; CHECK-SYMGV: cmpq 16(%rsp), %rax -; CHECK-SYMGV-NEXT: jne .LBB0_2 -; CHECK-SYMGV: .LBB0_2: -; CHECK-SYMGV-NEXT: .cfi_def_cfa_offset 32 -; CHECK-SYMGV-NEXT: callq __stack_chk_fail - ; ModuleID = 't.c' -;--- existedGV.ll - -@__woof = dso_local local_unnamed_addr global ptr null, align 8 - -;--- main.ll - @.str = private unnamed_addr constant [14 x i8] c"stackoverflow\00", align 1 @a = dso_local local_unnamed_addr global ptr null, align 8 @@ -130,6 +104,3 @@ attributes #2 = { nounwind } ;--- g.ll !llvm.module.flags = !{!1} !1 = !{i32 2, !"stack-protector-guard-offset", i32 -20} -;--- h.ll -!llvm.module.flags = !{!1} -!1 = !{i32 2, !"stack-protector-guard-symbol", !"__woof"} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
