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

Keep the memory allocator local to module loaders, instead of module map parser.

Browse Source
This commit is contained in:
Artem Chikin
2020-07-21 13:45:27 -07:00
parent 7a736f6582
commit 1d49d22574
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -1513,11 +1513,12 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
struct ExplicitSwiftModuleLoader::Implementation {
ASTContext &Ctx;
llvm::BumpPtrAllocator Allocator;
llvm::StringMap<ExplicitModuleInfo> ExplicitModuleMap;
Implementation(ASTContext &Ctx) : Ctx(Ctx) {}
void parseSwiftExplicitModuleMap(StringRef fileName) {
ExplicitModuleMapParser parser(Ctx);
ExplicitModuleMapParser parser(Allocator);
auto result =
parser.parseSwiftExplicitModuleMap(fileName, ExplicitModuleMap);
if (result == std::errc::invalid_argument)
@@ -1587,8 +1588,6 @@ std::error_code ExplicitModuleMapParser::parseSwiftExplicitModuleMap(
}
}
} else {
Ctx.Diags.diagnose(SourceLoc(), diag::explicit_swift_module_map_corrupted,
fileName);
return std::make_error_code(std::errc::invalid_argument);
}
}