averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +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

9
lib/Serialization/ModuleDependencyScanner.cpp
View File

@@ -102,6 +102,7 @@ class ExternalSwiftModuleStubScanner : public ModuleDependencyScanner {
/// Scan the given external module map
void parseExternalModuleMap(StringRef fileName);
llvm::StringMap<ExplicitModuleInfo> ExternalDependencyModuleMap;
llvm::BumpPtrAllocator Allocator;
public:
ExternalSwiftModuleStubScanner(ASTContext &ctx, ModuleLoadingMode LoadMode,
@@ -139,17 +140,11 @@ public:
this->dependencies = std::move(dependencies);
return std::error_code{};
}
public:
static std::unique_ptr<ExternalSwiftModuleStubScanner>
create(ASTContext &ctx, DependencyTracker *tracker,
ModuleLoadingMode loadMode, StringRef ExternalDependencyModuleMap,
bool IgnoreSwiftSourceInfoFile);
};
} // namespace
void ExternalSwiftModuleStubScanner::parseExternalModuleMap(StringRef fileName) {
ExplicitModuleMapParser parser(Ctx);
ExplicitModuleMapParser parser(Allocator);
auto result =
parser.parseSwiftExplicitModuleMap(fileName, ExternalDependencyModuleMap);
if (result == std::errc::invalid_argument)