feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmake: use reserve to optimize memory allocation

Browse Source 
Change-Id: I6ace338512c24fd9dc11c767a28f0a63454076fa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/1d3503b8f3b49b0f684e1caa504deb0d05f2c60a)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
This commit is contained in:
Anton Kudryavtsev
2016-02-01 11:49:22 +03:00
committed by Oswald Buddenhagen
parent d882ae9cb7
commit 3f4e40e3c1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -146,6 +146,7 @@ void QMakeEvaluator::initFunctionStatics()
{ "shell_quote", E_SHELL_QUOTE }, { "shell_quote", E_SHELL_QUOTE },
{ "getenv", E_GETENV }, { "getenv", E_GETENV },
}; };
statics.expands.reserve((int)(sizeof(expandInits)/sizeof(expandInits[0])));
for (unsigned i = 0; i < sizeof(expandInits)/sizeof(expandInits[0]); ++i) for (unsigned i = 0; i < sizeof(expandInits)/sizeof(expandInits[0]); ++i)
statics.expands.insert(ProKey(expandInits[i].name), expandInits[i].func); statics.expands.insert(ProKey(expandInits[i].name), expandInits[i].func);
@@ -187,6 +188,7 @@ void QMakeEvaluator::initFunctionStatics()
{ "touch", T_TOUCH }, { "touch", T_TOUCH },
{ "cache", T_CACHE }, { "cache", T_CACHE },
}; };
statics.functions.reserve((int)(sizeof(testInits)/sizeof(testInits[0])));
for (unsigned i = 0; i < sizeof(testInits)/sizeof(testInits[0]); ++i) for (unsigned i = 0; i < sizeof(testInits)/sizeof(testInits[0]); ++i)
statics.functions.insert(ProKey(testInits[i].name), testInits[i].func); statics.functions.insert(ProKey(testInits[i].name), testInits[i].func);
} }

5
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -183,6 +183,7 @@ void QMakeEvaluator::initStatics()
{ "IN_PWD", "PWD" }, { "IN_PWD", "PWD" },
{ "DEPLOYMENT", "INSTALLS" } { "DEPLOYMENT", "INSTALLS" }
}; };
statics.varMap.reserve((int)(sizeof(mapInits)/sizeof(mapInits[0])));
for (unsigned i = 0; i < sizeof(mapInits)/sizeof(mapInits[0]); ++i) for (unsigned i = 0; i < sizeof(mapInits)/sizeof(mapInits[0]); ++i)
statics.varMap.insert(ProKey(mapInits[i].oldname), ProKey(mapInits[i].newname)); statics.varMap.insert(ProKey(mapInits[i].oldname), ProKey(mapInits[i].newname));
} }
@@ -760,12 +761,14 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProLoop(
if (ok) { if (ok) {
int end = itl.mid(dotdot+2).toInt(&ok); int end = itl.mid(dotdot+2).toInt(&ok);
if (ok) { if (ok) {
if (m_cumulative && qAbs(end - start) > 100) { const int absDiff = qAbs(end - start);
if (m_cumulative && absDiff > 100) {
// Such a loop is unlikely to contribute something useful to the // Such a loop is unlikely to contribute something useful to the
// file collection, and may cause considerable delay. // file collection, and may cause considerable delay.
traceMsg("skipping excessive loop in cumulative mode"); traceMsg("skipping excessive loop in cumulative mode");
return ReturnFalse; return ReturnFalse;
} }
list.reserve(absDiff + 1);
if (start < end) { if (start < end) {
for (int i = start; i <= end; i++) for (int i = start; i <= end; i++)
list << ProString(QString::number(i)); list << ProString(QString::number(i));