From 727ed0c403ad87c5cae84222d7d69b95b665b63f Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 25 Sep 2020 10:12:20 -0400 Subject: cmMakefile: Simplify ExpandArguments signature The only call sites that pass the explicit file name argument are in function blocker `ArgumentsMatch` methods for `function` and `macro`. We already ensure that they are balanced within a file scope, and the RAII helpers `BuildsystemFileScope` and `ListFileScope` ensure that the backtrace and execution list file stacks unwind to the matching level. Therefore we can assume that the file name where we are checking for matching arguments matches starting file name where those arguments first appeared, and do not need to pass it explicitly. --- Source/cmFunctionCommand.cxx | 3 +-- Source/cmMacroCommand.cxx | 3 +-- Source/cmMakefile.cxx | 23 ++++++++--------------- Source/cmMakefile.h | 7 ++----- 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx index b6f58bd..46bd057 100644 --- a/Source/cmFunctionCommand.cxx +++ b/Source/cmFunctionCommand.cxx @@ -147,8 +147,7 @@ bool cmFunctionFunctionBlocker::ArgumentsMatch(cmListFileFunction const& lff, cmMakefile& mf) const { std::vector expandedArguments; - mf.ExpandArguments(lff.Arguments, expandedArguments, - this->GetStartingContext().FilePath.c_str()); + mf.ExpandArguments(lff.Arguments, expandedArguments); return expandedArguments.empty() || expandedArguments.front() == this->Args.front(); } diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index c88b343..91a600e 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -157,8 +157,7 @@ bool cmMacroFunctionBlocker::ArgumentsMatch(cmListFileFunction const& lff, cmMakefile& mf) const { std::vector expandedArguments; - mf.ExpandArguments(lff.Arguments, expandedArguments, - this->GetStartingContext().FilePath.c_str()); + mf.ExpandArguments(lff.Arguments, expandedArguments); return expandedArguments.empty() || expandedArguments[0] == this->Args[0]; } diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index e529896..2147026 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3335,13 +3335,9 @@ std::string const& cmMakefile::GetExecutionFilePath() const } bool cmMakefile::ExpandArguments(std::vector const& inArgs, - std::vector& outArgs, - const char* filename) const + std::vector& outArgs) const { - if (!filename) { - auto const& efp = this->GetExecutionFilePath(); - filename = efp.c_str(); - } + std::string const& filename = this->GetExecutionFilePath(); std::string value; outArgs.reserve(inArgs.size()); for (cmListFileArgument const& i : inArgs) { @@ -3352,8 +3348,8 @@ bool cmMakefile::ExpandArguments(std::vector const& inArgs, } // Expand the variables in the argument. value = i.Value; - this->ExpandVariablesInString(value, false, false, false, filename, i.Line, - false, false); + this->ExpandVariablesInString(value, false, false, false, filename.c_str(), + i.Line, false, false); // If the argument is quoted, it should be one argument. // Otherwise, it may be a list of arguments. @@ -3368,12 +3364,9 @@ bool cmMakefile::ExpandArguments(std::vector const& inArgs, bool cmMakefile::ExpandArguments( std::vector const& inArgs, - std::vector& outArgs, const char* filename) const + std::vector& outArgs) const { - if (!filename) { - auto const& efp = this->GetExecutionFilePath(); - filename = efp.c_str(); - } + std::string const& filename = this->GetExecutionFilePath(); std::string value; outArgs.reserve(inArgs.size()); for (cmListFileArgument const& i : inArgs) { @@ -3384,8 +3377,8 @@ bool cmMakefile::ExpandArguments( } // Expand the variables in the argument. value = i.Value; - this->ExpandVariablesInString(value, false, false, false, filename, i.Line, - false, false); + this->ExpandVariablesInString(value, false, false, false, filename.c_str(), + i.Line, false, false); // If the argument is quoted, it should be one argument. // Otherwise, it may be a list of arguments. diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index bd7753a..022c029 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -732,12 +732,9 @@ public: * variable replacement and list expansion. */ bool ExpandArguments(std::vector const& inArgs, - std::vector& outArgs, - const char* filename = nullptr) const; - + std::vector& outArgs) const; bool ExpandArguments(std::vector const& inArgs, - std::vector& outArgs, - const char* filename = nullptr) const; + std::vector& outArgs) const; /** * Get the instance -- cgit v0.12