Skip to content

Commit d68059b

Browse files
committed
[NFC] [clangd] [Modules] Change the argument type of IsModuleFileUpToDate to reference
It is better to use references instead of pointers as the argument type of IsModuleFileUpToDate. Since the PrerequisiteModules is always expected to exist.
1 parent cd634f5 commit d68059b

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

clang-tools-extra/clangd/ModulesBuilder.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,12 @@ struct ModuleFile {
129129

130130
bool IsModuleFileUpToDate(
131131
PathRef ModuleFilePath,
132-
const PrerequisiteModules *RequisiteModules) {
132+
const PrerequisiteModules &RequisiteModules) {
133133
IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
134134
CompilerInstance::createDiagnostics(new DiagnosticOptions());
135135

136136
auto HSOpts = std::make_shared<HeaderSearchOptions>();
137-
if (RequisiteModules)
138-
RequisiteModules->adjustHeaderSearchOptions(*HSOpts);
137+
RequisiteModules.adjustHeaderSearchOptions(*HSOpts);
139138
HSOpts->ForceCheckCXX20ModulesInputFiles = true;
140139
HSOpts->ValidateASTInputFilesContent = true;
141140

@@ -168,8 +167,8 @@ IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
168167

169168
bool IsModuleFilesUpToDate(
170169
llvm::SmallVector<PathRef> ModuleFilePaths,
171-
const PrerequisiteModules *RequisiteModules = nullptr) {
172-
return llvm::all_of(ModuleFilePaths, [RequisiteModules](auto ModuleFilePath) {
170+
const PrerequisiteModules &RequisiteModules) {
171+
return llvm::all_of(ModuleFilePaths, [&RequisiteModules](auto ModuleFilePath) {
173172
return IsModuleFileUpToDate(ModuleFilePath, RequisiteModules);
174173
});
175174
}
@@ -348,7 +347,7 @@ bool StandalonePrerequisiteModules::canReuse(
348347
SmallVector<StringRef> BMIPaths;
349348
for (auto &MF : RequiredModules)
350349
BMIPaths.push_back(MF.ModuleFilePath);
351-
return IsModuleFilesUpToDate(BMIPaths, this);
350+
return IsModuleFilesUpToDate(BMIPaths, *this);
352351
}
353352

354353
} // namespace clangd

0 commit comments

Comments
 (0)