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

Replace uses of llvm::Fixnum with llvm::PointerEmbeddedInt.

Browse Source 
The two types are nearly identical, and Fixnum is only in the Swift branches of LLVM,
not in mainline LLVM.

I do want to add ++ to PointerEmbeddedInt and fix some of this ugliness, but that'll
have to go through LLVM review, so it might take a bit.
This commit is contained in:
Jordan Rose
2016-02-09 12:43:03 -08:00
parent b0f94ed4b7
commit 36a44cf308
13 changed files with 79 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/ModuleFile.cpp
View File

@@ -355,7 +355,7 @@ public:
static std::pair<unsigned, unsigned> ReadKeyDataLength(const uint8_t *&data) {
unsigned keyLength = endian::readNext<uint16_t, little, unaligned>(data);
return { keyLength, sizeof(DeclID) + sizeof(unsigned) };
return { keyLength, sizeof(uint32_t) + sizeof(unsigned) };
}
static internal_key_type ReadKey(const uint8_t *data, unsigned length) {
@@ -364,7 +364,7 @@ public:
static data_type ReadData(internal_key_type key, const uint8_t *data,
unsigned length) {
auto declID = endian::readNext<DeclID, little, unaligned>(data);
auto declID = endian::readNext<uint32_t, little, unaligned>(data);
auto discriminator = endian::readNext<unsigned, little, unaligned>(data);
return { declID, discriminator };
}
@@ -432,7 +432,7 @@ public:
bool isInstanceMethod = *data++ != 0;
DeclID methodID = endian::readNext<uint32_t, little, unaligned>(data);
result.push_back(std::make_tuple(typeID, isInstanceMethod, methodID));
length -= sizeof(TypeID) + 1 + sizeof(DeclID);
length -= sizeof(uint32_t) + 1 + sizeof(uint32_t);
}
return result;