Clean up -fdiscard-value-name handling

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@325171 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/ToolChains/Clang.cpp b/lib/Driver/ToolChains/Clang.cpp
index 185270c61abdfbf74fb1dbe9a83cd081197e9397..64bea9e56ab677ba55cc4b825d6ee0f7940d7c49 100644 (file)
--- a/lib/Driver/ToolChains/Clang.cpp
+++ b/lib/Driver/ToolChains/Clang.cpp
@@ -3281,11 +3281,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-disable-llvm-verifier");
 
   // Discard value names in assert builds unless otherwise specified.
-  if (const Arg *A = Args.getLastArg(options::OPT_fdiscard_value_names,
-                                     options::OPT_fno_discard_value_names)) {
-    if (A->getOption().matches(options::OPT_fdiscard_value_names))
-      CmdArgs.push_back("-discard-value-names");
-  } else if (!IsAssertBuild)
+  if (Args.hasFlag(options::OPT_fdiscard_value_names,
+                   options::OPT_fno_discard_value_names, !IsAssertBuild))
     CmdArgs.push_back("-discard-value-names");
 
   // Set the main file name, so that debug info works even with