mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
Merge remote-tracking branch 'origin/main' into manual-main-merge
Conflicts:
- `lib/Driver/ToolChains.cpp` conflicting with the `addAllArgs` rename
for multiple options
This commit is contained in:
@@ -51,8 +51,12 @@ private:
|
||||
scanFilesystemForSwiftModuleDependency(Identifier moduleName,
|
||||
const ModuleDependenciesCache &cache);
|
||||
|
||||
// Worker-specific instance of CompilerInvocation
|
||||
std::unique_ptr<CompilerInvocation> workerCompilerInvocation;
|
||||
// Worker-specific instance of ASTContext
|
||||
std::unique_ptr<ASTContext> workerASTContext;
|
||||
// An AST delegate for interface scanning.
|
||||
std::unique_ptr<InterfaceSubContextDelegateImpl> ScanningASTDelegate;
|
||||
std::unique_ptr<InterfaceSubContextDelegateImpl> scanningASTDelegate;
|
||||
// The Clang scanner tool used by this worker.
|
||||
clang::tooling::dependencies::DependencyScanningTool clangScanningTool;
|
||||
// Swift and Clang module loaders acting as scanners.
|
||||
|
||||
Reference in New Issue
Block a user