diff options
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 5 | ||||
| -rw-r--r-- | clang/test/CodeGen/attr-speculative-load-hardening.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 9a36f7b429c..6b2083ce025 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4452,8 +4452,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddLastArg(CmdArgs, options::OPT_pthread); - Args.AddLastArg(CmdArgs, options::OPT_mspeculative_load_hardening, - options::OPT_mno_speculative_load_hardening); + if (Args.hasFlag(options::OPT_mspeculative_load_hardening, options::OPT_mno_speculative_load_hardening, + false)) + CmdArgs.push_back(Args.MakeArgString("-mspeculative-load-hardening")); RenderSSPOptions(TC, Args, CmdArgs, KernelOrKext); diff --git a/clang/test/CodeGen/attr-speculative-load-hardening.c b/clang/test/CodeGen/attr-speculative-load-hardening.c index ccbded44bb4..97bccd03585 100644 --- a/clang/test/CodeGen/attr-speculative-load-hardening.c +++ b/clang/test/CodeGen/attr-speculative-load-hardening.c @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -mspeculative-load-hardening -disable-llvm-passes -emit-llvm %s -o - | FileCheck %s -check-prefix=SLH +// RUN: %clang -mno-speculative-load-hardening -S -emit-llvm %s -o - | FileCheck %s -check-prefix=NOSLH // // Check that we set the attribute on each function. @@ -8,3 +9,7 @@ int test1() { // SLH: @{{.*}}test1{{.*}}[[SLH:#[0-9]+]] // SLH: attributes [[SLH]] = { {{.*}}speculative_load_hardening{{.*}} } + +// NOSLH: @{{.*}}test1{{.*}}[[NOSLH:#[0-9]+]] + +// NOSLH-NOT: attributes [[SLH]] = { {{.*}}speculative_load_hardening{{.*}} } |
