Merge remote-tracking branch 'origin/main' into rebranch

This commit is contained in:
swift-ci
2021-08-06 14:13:40 -07:00
13 changed files with 433 additions and 238 deletions

View File

@@ -1069,7 +1069,6 @@ withSemanticAnalysis(CompilerInstance &Instance, FrontendObserver *observer,
static bool performScanDependencies(CompilerInstance &Instance) {
auto batchScanInput =
Instance.getASTContext().SearchPathOpts.BatchScanInputFilePath;
ModuleDependenciesCache SingleUseCache;
if (batchScanInput.empty()) {
if (Instance.getInvocation().getFrontendOptions().ImportPrescan)
return dependencies::prescanDependencies(Instance);