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

ClangCodeModel: Move another call out of a tight loop

Browse Source 
... when creating a compilation db.

Change-Id: I4d392587f13214042b449a450ef1d4ae1c283ecb
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Christian Kandeler
2022-05-05 15:50:46 +02:00
parent 0a9d1df61d
commit 3ce7ca7242
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -187,7 +187,8 @@ static QJsonObject createFileObject(const FilePath &buildDir,
const ProjectPart &projectPart,
const ProjectFile &projFile,
CompilationDbPurpose purpose,
const QStringList &projectOptions)
const QStringList &projectOptions,
UsePrecompiledHeaders usePch)
{
QJsonObject fileObject;
fileObject["file"] = projFile.path;
@@ -213,7 +214,7 @@ static QJsonObject createFileObject(const FilePath &buildDir,
}
} else {
args = QJsonArray::fromStringList(clangOptionsForFile(optionsBuilder, projFile,
projectOptions));
projectOptions, usePch));
args.prepend("clang"); // TODO: clang-cl for MSVC targets? Does it matter at all what we put here?
}
@@ -243,6 +244,7 @@ GenerateCompilationDbResult generateCompilationDB(const CppEditor::ProjectInfo::
}
compileCommandsFile.write("[");
const UsePrecompiledHeaders usePch = getPchUsage();
for (ProjectPart::ConstPtr projectPart : projectInfo->projectParts()) {
QStringList args;
const CompilerOptionsBuilder optionsBuilder = clangOptionsBuilder(*projectPart,
@@ -251,7 +253,7 @@ GenerateCompilationDbResult generateCompilationDB(const CppEditor::ProjectInfo::
args = projectPartArguments(*projectPart);
for (const ProjectFile &projFile : projectPart->files) {
const QJsonObject json = createFileObject(baseDir, args, optionsBuilder, *projectPart,
projFile, purpose, projectOptions);
projFile, purpose, projectOptions, usePch);
if (compileCommandsFile.size() > 1)
compileCommandsFile.write(",");
compileCommandsFile.write('\n' + QJsonDocument(json).toJson().trimmed());
@@ -334,20 +336,20 @@ static ClangProjectSettings &getProjectSettings(ProjectExplorer::Project *projec
} // namespace
QStringList clangOptionsForFile(CompilerOptionsBuilder optionsBuilder,
const ProjectFile &file, const QStringList &projectOptions)
const ProjectFile &file, const QStringList &projectOptions,
UsePrecompiledHeaders usePch)
{
ProjectFile::Kind fileKind = file.kind;
if (fileKind == ProjectFile::AmbiguousHeader) {
fileKind = optionsBuilder.projectPart().languageVersion <= LanguageVersion::LatestC
? ProjectFile::CHeader : ProjectFile::CXXHeader;
}
auto pchUsage = getPchUsage();
if (pchUsage == UsePrecompiledHeaders::Yes
if (usePch == UsePrecompiledHeaders::Yes
&& optionsBuilder.projectPart().precompiledHeaders.contains(file.path)) {
pchUsage = UsePrecompiledHeaders::No;
usePch = UsePrecompiledHeaders::No;
}
optionsBuilder.updateFileLanguage(file.kind);
optionsBuilder.addPrecompiledHeaderOptions(pchUsage);
optionsBuilder.addPrecompiledHeaderOptions(usePch);
return projectOptions + optionsBuilder.options();
}