From 4b76a80459e69daca2f62f522a6117a9350613dc Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Tue, 11 Oct 2022 11:42:40 -0500 Subject: [PATCH] [Clang] Fix use of `hasArg` when `hasFlag` should be used instead Summary: This option forwards a clang flag with a `-no` variant to the Clang compiler. It should use the `hasFlag` so it works properly when the option is overridden. --- clang/lib/Driver/ToolChains/Clang.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 1a3ee09..93e0a18 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -6233,7 +6233,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } // Forward the new driver to change offloading code generation. - if (Args.hasArg(options::OPT_offload_new_driver)) + if (Args.hasFlag(options::OPT_offload_new_driver, + options::OPT_no_offload_new_driver, false)) CmdArgs.push_back("--offload-new-driver"); SanitizeArgs.addArgs(TC, Args, CmdArgs, InputType); -- 2.7.4