kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'reduce-allocations'

Browse Source 
70788e92 Remove temporary allocations when calling cmHasLiteral{Suf,Pre}fix.
bd2384f5 Optimize cmMakefile::ExpandVariablesInStringNew.
ad9394f4 Remove temporary allocations in cmMacroHelper::InvokeInitialPass.
f9599ed4 Remove temporary allocations by extending the lifetime of the retval.
275f2a85 Remove temporary allocations when calling cmGeneratorTarget::GetName.
This commit is contained in:
Brad King 2016-01-21 13:55:53 -05:00 committed by CMake Topic Stage
commit 3e7794a2e6
6 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmAlgorithms.h
View File

@ -52,13 +52,13 @@ template<typename T, size_t N>
size_t cmArraySize(const T (&)[N]) { return N; } size_t cmArraySize(const T (&)[N]) { return N; }
template<typename T, size_t N> template<typename T, size_t N>
bool cmHasLiteralPrefix(T str1, const char (&str2)[N]) bool cmHasLiteralPrefix(const T& str1, const char (&str2)[N])
{ {
return cmHasLiteralPrefixImpl(str1, str2, N - 1); return cmHasLiteralPrefixImpl(str1, str2, N - 1);
} }
template<typename T, size_t N> template<typename T, size_t N>
bool cmHasLiteralSuffix(T str1, const char (&str2)[N]) bool cmHasLiteralSuffix(const T& str1, const char (&str2)[N])
{ {
return cmHasLiteralSuffixImpl(str1, str2, N - 1); return cmHasLiteralSuffixImpl(str1, str2, N - 1);
} }

2
Source/cmGeneratorTarget.cxx
View File

@ -335,7 +335,7 @@ cmState::TargetType cmGeneratorTarget::GetType() const
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string cmGeneratorTarget::GetName() const const std::string& cmGeneratorTarget::GetName() const
{ {
return this->Target->GetName(); return this->Target->GetName();
} }

2
Source/cmGeneratorTarget.h
View File

@ -55,7 +55,7 @@ public:
GetLinkInformation(const std::string& config) const; GetLinkInformation(const std::string& config) const;
cmState::TargetType GetType() const; cmState::TargetType GetType() const;
std::string GetName() const; const std::string& GetName() const;
std::string GetExportName() const; std::string GetExportName() const;
std::vector<std::string> GetPropertyKeys() const; std::vector<std::string> GetPropertyKeys() const;

12
Source/cmGlobalGenerator.cxx
View File

@ -2198,9 +2198,9 @@ cmGlobalGenerator::FindGeneratorTargetImpl(std::string const& name) const
{ {
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{ {
std::vector<cmGeneratorTarget*> tgts = const std::vector<cmGeneratorTarget*>& tgts =
this->LocalGenerators[i]->GetGeneratorTargets(); this->LocalGenerators[i]->GetGeneratorTargets();
for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin(); for (std::vector<cmGeneratorTarget*>::const_iterator it = tgts.begin();
it != tgts.end(); ++it) it != tgts.end(); ++it)
{ {
if ((*it)->GetName() == name) if ((*it)->GetName() == name)
@ -2217,9 +2217,9 @@ cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
{ {
for (unsigned int i = 0; i < this->Makefiles.size(); ++i) for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
{ {
std::vector<cmTarget*> tgts = const std::vector<cmTarget*>& tgts =
this->Makefiles[i]->GetOwnedImportedTargets(); this->Makefiles[i]->GetOwnedImportedTargets();
for (std::vector<cmTarget*>::iterator it = tgts.begin(); for (std::vector<cmTarget*>::const_iterator it = tgts.begin();
it != tgts.end(); ++it) it != tgts.end(); ++it)
{ {
if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible()) if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
@ -2236,9 +2236,9 @@ cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
{ {
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{ {
std::vector<cmGeneratorTarget*> tgts = const std::vector<cmGeneratorTarget*>& tgts =
this->LocalGenerators[i]->GetImportedGeneratorTargets(); this->LocalGenerators[i]->GetImportedGeneratorTargets();
for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin(); for (std::vector<cmGeneratorTarget*>::const_iterator it = tgts.begin();
it != tgts.end(); ++it) it != tgts.end(); ++it)
{ {
if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name) if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)

16
Source/cmMacroCommand.cxx
View File

@ -146,16 +146,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
// replace formal arguments // replace formal arguments
for (unsigned int j = 0; j < variables.size(); ++j) for (unsigned int j = 0; j < variables.size(); ++j)
{ {
cmSystemTools::ReplaceString(arg.Value, variables[j].c_str(), cmSystemTools::ReplaceString(arg.Value, variables[j],
expandedArgs[j].c_str()); expandedArgs[j]);
} }
// replace argc // replace argc
cmSystemTools::ReplaceString(arg.Value, "${ARGC}",argcDef.c_str()); cmSystemTools::ReplaceString(arg.Value, "${ARGC}", argcDef);
cmSystemTools::ReplaceString(arg.Value, "${ARGN}", cmSystemTools::ReplaceString(arg.Value, "${ARGN}", expandedArgn);
expandedArgn.c_str()); cmSystemTools::ReplaceString(arg.Value, "${ARGV}", expandedArgv);
cmSystemTools::ReplaceString(arg.Value, "${ARGV}",
expandedArgv.c_str());
// if the current argument of the current function has ${ARGV in it // if the current argument of the current function has ${ARGV in it
// then try replacing ARGV values // then try replacing ARGV values
@ -163,8 +161,8 @@ bool cmMacroHelperCommand::InvokeInitialPass
{ {
for (unsigned int t = 0; t < expandedArgs.size(); ++t) for (unsigned int t = 0; t < expandedArgs.size(); ++t)
{ {
cmSystemTools::ReplaceString(arg.Value, argVs[t].c_str(), cmSystemTools::ReplaceString(arg.Value, argVs[t],
expandedArgs[t].c_str()); expandedArgs[t]);
} }
} }
} }

19
Source/cmMakefile.cxx
View File

@ -2832,10 +2832,9 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
const char* last = in; const char* last = in;
std::string result; std::string result;
result.reserve(source.size()); result.reserve(source.size());
std::stack<t_lookup> openstack; std::vector<t_lookup> openstack;
bool error = false; bool error = false;
bool done = false; bool done = false;
openstack.push(t_lookup());
cmake::MessageType mtype = cmake::LOG; cmake::MessageType mtype = cmake::LOG;
cmState* state = this->GetCMakeInstance()->GetState(); cmState* state = this->GetCMakeInstance()->GetState();
@ -2846,10 +2845,10 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
switch(inc) switch(inc)
{ {
case '}': case '}':
if(openstack.size() > 1) if(!openstack.empty())
{ {
t_lookup var = openstack.top(); t_lookup var = openstack.back();
openstack.pop(); openstack.pop_back();
result.append(last, in - last); result.append(last, in - last);
std::string const& lookup = result.substr(var.loc); std::string const& lookup = result.substr(var.loc);
const char* value = NULL; const char* value = NULL;
@ -2970,7 +2969,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
last = start; last = start;
in = start - 1; in = start - 1;
lookup.loc = result.size(); lookup.loc = result.size();
openstack.push(lookup); openstack.push_back(lookup);
} }
break; break;
} }
@ -2997,7 +2996,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
result.append("\r"); result.append("\r");
last = next + 1; last = next + 1;
} }
else if(nextc == ';' && openstack.size() == 1) else if(nextc == ';' && openstack.empty())
{ {
// Handled in ExpandListArgument; pass the backslash literally. // Handled in ExpandListArgument; pass the backslash literally.
} }
@ -3065,7 +3064,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
{ {
if(openstack.size() > 1 && if(!openstack.empty() &&
!(isalnum(inc) || inc == '_' || !(isalnum(inc) || inc == '_' ||
inc == '/' || inc == '.' || inc == '/' || inc == '.' ||
inc == '+' || inc == '-')) inc == '+' || inc == '-'))
@ -3074,7 +3073,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
errorstr += inc; errorstr += inc;
result.append(last, in - last); result.append(last, in - last);
errorstr += "\') in a variable name: " errorstr += "\') in a variable name: "
"'" + result.substr(openstack.top().loc) + "'"; "'" + result.substr(openstack.back().loc) + "'";
mtype = cmake::FATAL_ERROR; mtype = cmake::FATAL_ERROR;
error = true; error = true;
} }
@ -3085,7 +3084,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
} while(!error && !done && *++in); } while(!error && !done && *++in);
// Check for open variable references yet. // Check for open variable references yet.
if(!error && openstack.size() != 1) if(!error && !openstack.empty())
{ {
// There's an open variable reference waiting. Policy CMP0010 flags // There's an open variable reference waiting. Policy CMP0010 flags
// whether this is an error or not. The new parser now enforces // whether this is an error or not. The new parser now enforces