Author: Simon Pilgrim Date: 2020-11-17T12:39:45Z New Revision: 0627140cd593e20b89b55e309c35c82ef618190e
URL: https://github.com/llvm/llvm-project/commit/0627140cd593e20b89b55e309c35c82ef618190e DIFF: https://github.com/llvm/llvm-project/commit/0627140cd593e20b89b55e309c35c82ef618190e.diff LOG: [clang][driver] Fix definition/declaration argument name mismatches. NFCI. AddCXXStdlibLibArgs args were using the names for the clang equivalent methods. Silences cppcheck warnings. Added: Modified: clang/lib/Driver/ToolChains/AIX.cpp clang/lib/Driver/ToolChains/CrossWindows.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/AIX.cpp b/clang/lib/Driver/ToolChains/AIX.cpp index 7b5d7da8c873..36fe578fcb3d 100644 --- a/clang/lib/Driver/ToolChains/AIX.cpp +++ b/clang/lib/Driver/ToolChains/AIX.cpp @@ -216,11 +216,11 @@ void AIX::AddClangSystemIncludeArgs(const ArgList &DriverArgs, addSystemInclude(DriverArgs, CC1Args, UP.str()); } -void AIX::AddCXXStdlibLibArgs(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const { - switch (GetCXXStdlibType(DriverArgs)) { +void AIX::AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args, + llvm::opt::ArgStringList &CmdArgs) const { + switch (GetCXXStdlibType(Args)) { case ToolChain::CST_Libcxx: - CC1Args.push_back("-lc++"); + CmdArgs.push_back("-lc++"); return; case ToolChain::CST_Libstdcxx: llvm::report_fatal_error("linking libstdc++ unimplemented on AIX"); diff --git a/clang/lib/Driver/ToolChains/CrossWindows.cpp b/clang/lib/Driver/ToolChains/CrossWindows.cpp index 28ad6c59c655..07abf4f83f7d 100644 --- a/clang/lib/Driver/ToolChains/CrossWindows.cpp +++ b/clang/lib/Driver/ToolChains/CrossWindows.cpp @@ -271,10 +271,10 @@ AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs, } void CrossWindowsToolChain:: -AddCXXStdlibLibArgs(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const { - if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) - CC1Args.push_back("-lc++"); +AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args, + llvm::opt::ArgStringList &CmdArgs) const { + if (GetCXXStdlibType(Args) == ToolChain::CST_Libcxx) + CmdArgs.push_back("-lc++"); } clang::SanitizerMask CrossWindowsToolChain::getSupportedSanitizers() const { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
