Skip to content

Commit 34f1439

Browse files
committed
[clang][deps] NFC: Don't collect PCH input files
Since b4c83a1, PCH input files are no longer necessary.
1 parent 9184373 commit 34f1439

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,44 +66,30 @@ using PrebuiltModuleFilesT = decltype(HeaderSearchOptions::PrebuiltModuleFiles);
6666
class PrebuiltModuleListener : public ASTReaderListener {
6767
public:
6868
PrebuiltModuleListener(PrebuiltModuleFilesT &PrebuiltModuleFiles,
69-
llvm::StringSet<> &InputFiles, bool VisitInputFiles,
7069
llvm::SmallVector<std::string> &NewModuleFiles)
71-
: PrebuiltModuleFiles(PrebuiltModuleFiles), InputFiles(InputFiles),
72-
VisitInputFiles(VisitInputFiles), NewModuleFiles(NewModuleFiles) {}
70+
: PrebuiltModuleFiles(PrebuiltModuleFiles),
71+
NewModuleFiles(NewModuleFiles) {}
7372

7473
bool needsImportVisitation() const override { return true; }
75-
bool needsInputFileVisitation() override { return VisitInputFiles; }
76-
bool needsSystemInputFileVisitation() override { return VisitInputFiles; }
7774

7875
void visitImport(StringRef ModuleName, StringRef Filename) override {
7976
if (PrebuiltModuleFiles.insert({ModuleName.str(), Filename.str()}).second)
8077
NewModuleFiles.push_back(Filename.str());
8178
}
8279

83-
bool visitInputFile(StringRef Filename, bool isSystem, bool isOverridden,
84-
bool isExplicitModule) override {
85-
InputFiles.insert(Filename);
86-
return true;
87-
}
88-
8980
private:
9081
PrebuiltModuleFilesT &PrebuiltModuleFiles;
91-
llvm::StringSet<> &InputFiles;
92-
bool VisitInputFiles;
9382
llvm::SmallVector<std::string> &NewModuleFiles;
9483
};
9584

9685
/// Visit the given prebuilt module and collect all of the modules it
9786
/// transitively imports and contributing input files.
9887
static void visitPrebuiltModule(StringRef PrebuiltModuleFilename,
9988
CompilerInstance &CI,
100-
PrebuiltModuleFilesT &ModuleFiles,
101-
llvm::StringSet<> &InputFiles,
102-
bool VisitInputFiles) {
89+
PrebuiltModuleFilesT &ModuleFiles) {
10390
// List of module files to be processed.
10491
llvm::SmallVector<std::string> Worklist{PrebuiltModuleFilename.str()};
105-
PrebuiltModuleListener Listener(ModuleFiles, InputFiles, VisitInputFiles,
106-
Worklist);
92+
PrebuiltModuleListener Listener(ModuleFiles, Worklist);
10793

10894
while (!Worklist.empty())
10995
ASTReader::readASTFileControlBlock(
@@ -204,15 +190,13 @@ class DependencyScanningAction : public tooling::ToolAction {
204190

205191
ScanInstance.createSourceManager(*FileMgr);
206192

207-
llvm::StringSet<> PrebuiltModulesInputFiles;
208193
// Store the list of prebuilt module files into header search options. This
209194
// will prevent the implicit build to create duplicate modules and will
210195
// force reuse of the existing prebuilt module files instead.
211196
if (!ScanInstance.getPreprocessorOpts().ImplicitPCHInclude.empty())
212197
visitPrebuiltModule(
213198
ScanInstance.getPreprocessorOpts().ImplicitPCHInclude, ScanInstance,
214-
ScanInstance.getHeaderSearchOpts().PrebuiltModuleFiles,
215-
PrebuiltModulesInputFiles, /*VisitInputFiles=*/DepFS != nullptr);
199+
ScanInstance.getHeaderSearchOpts().PrebuiltModuleFiles);
216200

217201
// Use the dependency scanning optimized file system if requested to do so.
218202
if (DepFS) {

0 commit comments

Comments
 (0)