Skip to content

Commit 3980f4d

Browse files
committed
[clang][deps] NFC: Don't collect PCH input files
Since b4c83a1, PCH input files are no longer necessary. (cherry picked from commit 34f1439)
1 parent 2c8679a commit 3980f4d

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,27 +74,18 @@ class PrebuiltModuleListener : public ASTReaderListener {
7474
public:
7575
PrebuiltModuleListener(CompilerInstance &CI,
7676
PrebuiltModuleFilesT &PrebuiltModuleFiles,
77-
llvm::StringSet<> &InputFiles, bool VisitInputFiles,
7877
llvm::SmallVector<std::string> &NewModuleFiles)
7978
: CI(CI), PrebuiltModuleFiles(PrebuiltModuleFiles),
80-
InputFiles(InputFiles), VisitInputFiles(VisitInputFiles),
79+
8180
NewModuleFiles(NewModuleFiles) {}
8281

8382
bool needsImportVisitation() const override { return true; }
84-
bool needsInputFileVisitation() override { return VisitInputFiles; }
85-
bool needsSystemInputFileVisitation() override { return VisitInputFiles; }
8683

8784
void visitImport(StringRef ModuleName, StringRef Filename) override {
8885
if (PrebuiltModuleFiles.insert({ModuleName.str(), Filename.str()}).second)
8986
NewModuleFiles.push_back(Filename.str());
9087
}
9188

92-
bool visitInputFile(StringRef Filename, bool isSystem, bool isOverridden,
93-
bool isExplicitModule) override {
94-
InputFiles.insert(Filename);
95-
return true;
96-
}
97-
9889
bool readModuleCacheKey(StringRef ModuleName, StringRef Filename,
9990
StringRef CacheKey) override {
10091
CI.getFrontendOpts().ModuleCacheKeys.emplace_back(std::string(Filename),
@@ -106,22 +97,17 @@ class PrebuiltModuleListener : public ASTReaderListener {
10697
private:
10798
CompilerInstance &CI;
10899
PrebuiltModuleFilesT &PrebuiltModuleFiles;
109-
llvm::StringSet<> &InputFiles;
110-
bool VisitInputFiles;
111100
llvm::SmallVector<std::string> &NewModuleFiles;
112101
};
113102

114103
/// Visit the given prebuilt module and collect all of the modules it
115104
/// transitively imports and contributing input files.
116105
static void visitPrebuiltModule(StringRef PrebuiltModuleFilename,
117106
CompilerInstance &CI,
118-
PrebuiltModuleFilesT &ModuleFiles,
119-
llvm::StringSet<> &InputFiles,
120-
bool VisitInputFiles) {
107+
PrebuiltModuleFilesT &ModuleFiles) {
121108
// List of module files to be processed.
122109
llvm::SmallVector<std::string> Worklist{PrebuiltModuleFilename.str()};
123-
PrebuiltModuleListener Listener(CI, ModuleFiles, InputFiles, VisitInputFiles,
124-
Worklist);
110+
PrebuiltModuleListener Listener(CI, ModuleFiles, Worklist);
125111

126112
while (!Worklist.empty())
127113
ASTReader::readASTFileControlBlock(
@@ -375,16 +361,13 @@ class DependencyScanningAction : public tooling::ToolAction {
375361

376362
ScanInstance.createSourceManager(*FileMgr);
377363

378-
llvm::StringSet<> PrebuiltModulesInputFiles;
379364
// Store the list of prebuilt module files into header search options. This
380365
// will prevent the implicit build to create duplicate modules and will
381366
// force reuse of the existing prebuilt module files instead.
382367
if (!ScanInstance.getPreprocessorOpts().ImplicitPCHInclude.empty())
383368
visitPrebuiltModule(
384369
ScanInstance.getPreprocessorOpts().ImplicitPCHInclude, ScanInstance,
385-
ScanInstance.getHeaderSearchOpts().PrebuiltModuleFiles,
386-
PrebuiltModulesInputFiles,
387-
/*VisitInputFiles=*/getDepScanFS() != nullptr);
370+
ScanInstance.getHeaderSearchOpts().PrebuiltModuleFiles);
388371

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

0 commit comments

Comments
 (0)