From a06ca4bd9016e396badf29252d982198bebb8283 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Wed, 14 Feb 2018 20:56:52 +0000 Subject: [PATCH] Clean up -fdiscard-value-name handling llvm-svn: 325171 --- clang/lib/Driver/ToolChains/Clang.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 185270c61abd..64bea9e56ab6 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/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