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

Manually merge remote-tracking branch 'upstream/master' into HEAD

Browse Source 
Conflicts:
	lib/Frontend/CompilerInvocation.cpp
	lib/Frontend/ModuleInterfaceLoader.cpp
	lib/Serialization/ModuleFile.cpp
This commit is contained in:
Nathan Hawes
2020-09-03 11:31:12 -07:00
parent 5dc6566769 9b01139f26
commit e882f15a1a
17 changed files with 134 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Serialization/ModuleFile.cpp
View File

@@ -358,8 +358,7 @@ ModuleFile::getModuleName(ASTContext &Ctx, StringRef modulePath,
nullptr,
/*isFramework*/isFramework, loadedModuleFile,
&ExtInfo);
Name = std::string(loadedModuleFile->Name);
Name = loadedModuleFile->Name.str();
return std::move(moduleBuf.get());
}