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

ClangStaticAnalyzer: Extract inputAndOutputArgumentsRemoved()

Browse Source 
Change-Id: Ie9fbec44006775779280293661eff2ff28f2618a
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2016-04-05 14:58:42 +02:00
parent 2d8c58f028
commit 1689425127
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
View File

@@ -116,12 +116,8 @@ static void prependTargetTripleIfNotIncludedAndNotEmpty(QStringList *arguments,
} }
} }
// Removes (1) filePath (2) -o <somePath>. // Removes (1) inputFile (2) -o <somePath>.
// Prepends -m64/-m32 argument if not already included. QStringList inputAndOutputArgumentsRemoved(const QString &inputFile, const QStringList &arguments)
// Prepends -target if not already included.
static QStringList tweakedArguments(const QString &filePath,
const QStringList &arguments,
const ExtraToolChainInfo &extraParams)
{ {
QStringList newArguments; QStringList newArguments;
@@ -133,7 +129,7 @@ static QStringList tweakedArguments(const QString &filePath,
} else if (argument == QLatin1String("-o")) { } else if (argument == QLatin1String("-o")) {
skip = true; skip = true;
continue; continue;
} else if (QDir::fromNativeSeparators(argument) == filePath) { } else if (QDir::fromNativeSeparators(argument) == inputFile) {
continue; // TODO: Let it in? continue; // TODO: Let it in?
} }
@@ -141,6 +137,14 @@ static QStringList tweakedArguments(const QString &filePath,
} }
QTC_CHECK(skip == false); QTC_CHECK(skip == false);
return newArguments;
}
static QStringList tweakedArguments(const QString &filePath,
const QStringList &arguments,
const ExtraToolChainInfo &extraParams)
{
QStringList newArguments = inputAndOutputArgumentsRemoved(filePath, arguments);
prependWordWidthArgumentIfNotIncluded(&newArguments, extraParams.wordWidth); prependWordWidthArgumentIfNotIncluded(&newArguments, extraParams.wordWidth);
prependTargetTripleIfNotIncludedAndNotEmpty(&newArguments, extraParams.targetTriple); prependTargetTripleIfNotIncludedAndNotEmpty(&newArguments, extraParams.targetTriple);