averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32245 from nkcsgexi/scan-overlay-file

Browse Source 
DependenciesScanner: teach the scanner to handle cross-import overlays
This commit is contained in:
Xi Ge
2020-06-09 13:39:38 -07:00
committed by GitHub
parent f7fd83de3a 42cc989136
commit b65300f34e
9 changed files with 164 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/AST/Module.cpp
View File

@@ -1519,6 +1519,7 @@ const clang::Module *ModuleDecl::findUnderlyingClangModule() const {
namespace swift {
/// Represents a file containing information about cross-module overlays.
class OverlayFile {
friend class ModuleDecl;
/// The file that data should be loaded from.
StringRef filePath;
@@ -1535,7 +1536,10 @@ class OverlayFile {
/// before returning.
bool loadOverlayModuleNames(const ModuleDecl *M, SourceLoc diagLoc,
Identifier bystandingModule);
bool loadOverlayModuleNames(ASTContext &ctx,
StringRef module,
StringRef bystandingModule,
SourceLoc diagLoc);
public:
// Only allocate in ASTContexts.
void *operator new(size_t bytes) = delete;
@@ -1576,6 +1580,21 @@ void ModuleDecl::addCrossImportOverlayFile(StringRef file) {
.push_back(new (ctx) OverlayFile(ctx.AllocateCopy(file)));
}
llvm::SmallSetVector<Identifier, 4>
ModuleDecl::collectCrossImportOverlay(ASTContext &ctx,
StringRef file,
StringRef moduleName,
StringRef &bystandingModule) {
OverlayFile ovFile(file);
bystandingModule = llvm::sys::path::stem(file);
ovFile.loadOverlayModuleNames(ctx, moduleName, bystandingModule, SourceLoc());
llvm::SmallSetVector<Identifier, 4> result;
for (auto Id: ovFile.overlayModuleNames) {
result.insert(Id);
}
return result;
}
bool ModuleDecl::mightDeclareCrossImportOverlays() const {
return !declaredCrossImports.empty();
}
@@ -1802,15 +1821,15 @@ OverlayFileContents::load(std::unique_ptr<llvm::MemoryBuffer> input,
}
bool
OverlayFile::loadOverlayModuleNames(const ModuleDecl *M, SourceLoc diagLoc,
Identifier bystanderName) {
auto &ctx = M->getASTContext();
OverlayFile::loadOverlayModuleNames(ASTContext &ctx, StringRef module,
StringRef bystanderName,
SourceLoc diagLoc) {
llvm::vfs::FileSystem &fs = *ctx.SourceMgr.getFileSystem();
auto bufOrError = fs.getBufferForFile(filePath);
if (!bufOrError) {
ctx.Diags.diagnose(diagLoc, diag::cannot_load_swiftoverlay_file,
M->getName(), bystanderName,
module, bystanderName,
bufOrError.getError().message(), filePath);
return false;
}
@@ -1824,7 +1843,7 @@ OverlayFile::loadOverlayModuleNames(const ModuleDecl *M, SourceLoc diagLoc,
for (auto message : errorMessages)
ctx.Diags.diagnose(diagLoc, diag::cannot_load_swiftoverlay_file,
M->getName(), bystanderName, message, filePath);
module, bystanderName, message, filePath);
return false;
}
@@ -1838,6 +1857,15 @@ OverlayFile::loadOverlayModuleNames(const ModuleDecl *M, SourceLoc diagLoc,
return true;
}
bool
OverlayFile::loadOverlayModuleNames(const ModuleDecl *M, SourceLoc diagLoc,
Identifier bystanderName) {
return loadOverlayModuleNames(M->getASTContext(),
M->getName().str(),
bystanderName.str(),
diagLoc);
}
//===----------------------------------------------------------------------===//
// SourceFile Implementation
//===----------------------------------------------------------------------===//