diff options
| author | Arthur Eubanks <aeubanks@google.com> | 2023-05-17 15:33:03 -0700 |
|---|---|---|
| committer | Arthur Eubanks <aeubanks@google.com> | 2023-05-17 15:34:14 -0700 |
| commit | 3d7903f1008febc80cb104eedcbcd31d2690839f (patch) | |
| tree | a04f5e935293df4b1f6377fbe3d8a2c424f7231e | |
| parent | 7f5fb90bbb3f83f79521c3e47f3492c76c7ef809 (diff) | |
| download | llvm-3d7903f1008febc80cb104eedcbcd31d2690839f.tar.gz | |
Revert "[Driver] Support multi /guard: options"
This reverts commit 3b6f7e45a20990fdbc2b43dc08457fc79d53bd39.
See comments on D150645.
| -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, 2 insertions, 6 deletions
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index be4fceb79375..cbf12a151ff7 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -7872,7 +7872,7 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType, if (Args.hasArg(options::OPT__SLASH_kernel)) CmdArgs.push_back("-fms-kernel"); - for (const Arg *A : Args.filtered(options::OPT__SLASH_guard)) { + if (Arg *A = Args.getLastArg(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 d803ddad504c..b23d0aa2f1b8 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 - for (const Arg *A : Args.filtered(options::OPT__SLASH_guard)) { + if (Arg *A = Args.getLastArg(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 c7d7fae8426a..12d7023bd61b 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -647,10 +647,6 @@ // 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:' |