From: Joseph Huber <jhuber6@vols.utk.edu>
Date: Tue, 11 Oct 2022 16:42:40 +0000 (-0500)
Subject: [Clang] Fix use of `hasArg` when `hasFlag` should be used instead
X-Git-Tag: upstream/17.0.6~30938
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b76a80459e69daca2f62f522a6117a9350613dc;p=platform%2Fupstream%2Fllvm.git

[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.
---

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);