diff options
| author | Phoebe Wang <phoebe.wang@intel.com> | 2023-05-16 23:39:05 +0800 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2023-05-16 19:54:19 -0700 |
| commit | 46e68a27771548b4f814437b4ce649d85049c3e1 (patch) | |
| tree | e30b2d8460d01c35d5414e1f989021d647581ed0 | |
| parent | d5cce0a7781bfbb9322a2e9625c7f88253801148 (diff) | |
| download | llvm-46e68a27771548b4f814437b4ce649d85049c3e1.tar.gz | |
[Driver] Support multi /guard: options
Reviewed By: rnk
Differential Revision: https://reviews.llvm.org/D150645
(cherry picked from commit 3b6f7e45a20990fdbc2b43dc08457fc79d53bd39)
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/MSVC.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/cl-options.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index ec6860113b7e..238507e06335 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -7782,7 +7782,7 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType, if (Args.hasArg(options::OPT__SLASH_kernel)) CmdArgs.push_back("-fms-kernel"); - if (Arg *A = Args.getLastArg(options::OPT__SLASH_guard)) { + for (const Arg *A : Args.filtered(options::OPT__SLASH_guard)) { StringRef GuardArgs = A->getValue(); // The only valid options are "cf", "cf,nochecks", "cf-", "ehcont" and // "ehcont-". diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp index 8ad67ca3e13f..b8aa21b7a766 100644 --- a/clang/lib/Driver/ToolChains/MSVC.cpp +++ b/clang/lib/Driver/ToolChains/MSVC.cpp @@ -227,7 +227,7 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgValues(CmdArgs, options::OPT__SLASH_link); // Control Flow Guard checks - if (Arg *A = Args.getLastArg(options::OPT__SLASH_guard)) { + for (const Arg *A : Args.filtered(options::OPT__SLASH_guard)) { StringRef GuardArgs = A->getValue(); if (GuardArgs.equals_insensitive("cf") || GuardArgs.equals_insensitive("cf,nochecks")) { diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index 1d588bdfc1b0..d96b887b7d48 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -647,6 +647,10 @@ // RUN: %clang_cl /guard:ehcont -### -- %s 2>&1 | FileCheck -check-prefix=EHCONTGUARD %s // EHCONTGUARD: -ehcontguard +// RUN: %clang_cl /guard:cf /guard:ehcont -### -- %s 2>&1 | FileCheck -check-prefix=BOTHGUARD %s +// BOTHGUARD: -cfguard +// BOTHGUARD-SAME: -ehcontguard + // RUN: %clang_cl /guard:foo -### -- %s 2>&1 | FileCheck -check-prefix=CFGUARDINVALID %s // CFGUARDINVALID: invalid value 'foo' in '/guard:' |