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

This commit is contained in:
swift-ci
2023-09-25 09:36:22 -07:00
32 changed files with 1911 additions and 1535 deletions

View File

@@ -1261,10 +1261,7 @@ static bool performScanDependencies(CompilerInstance &Instance) {
else
return dependencies::scanDependencies(Instance);
} else {
if (Instance.getInvocation().getFrontendOptions().ImportPrescan)
return dependencies::batchPrescanDependencies(Instance, batchScanInput);
else
return dependencies::batchScanDependencies(Instance, batchScanInput);
return dependencies::batchScanDependencies(Instance, batchScanInput);
}
}