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 remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Bob Wilson
2018-06-15 20:20:25 -07:00
parent 2f74f65490 570ed72ea5
commit d933b5d60c
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Serialization/ModuleFile.cpp
View File

@@ -600,9 +600,8 @@ public:
}
static std::pair<unsigned, unsigned> ReadKeyDataLength(const uint8_t *&data) {
unsigned keyLength = endian::readNext<uint16_t, little, unaligned>(data);
unsigned dataLength = endian::readNext<uint16_t, little, unaligned>(data);
return { keyLength, dataLength };
return { sizeof(uint32_t), dataLength };
}
static internal_key_type ReadKey(const uint8_t *data, unsigned length) {