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

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

2
lib/Serialization/ModuleFileCoreTableInfo.h
View File

@@ -455,7 +455,7 @@ public:
while (data < limit) {
DeclID genSigId = endian::readNext<uint32_t, little, unaligned>(data);
int32_t nameLength = endian::readNext<int32_t, little, unaligned>(data);
StringRef mangledName(reinterpret_cast<const char *>(data), nameLength);
std::string mangledName(reinterpret_cast<const char *>(data), nameLength);
data += nameLength;
result.push_back({std::string(mangledName), genSigId});
}