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 PointerIntUnion with a PointerUnion-compatible Fixnum type.

Browse Source 
Per discussion on swift-dev, we'd prefer to have a "pointer-like" integer
with limited bit width, to reuse all the existing infrastructure for
pointer-like types, rather than invent another new data structure.

Swift SVN r5529
This commit is contained in:
Jordan Rose
2013-06-08 00:18:19 +00:00
parent e4e1d635a2
commit c8958a232e
6 changed files with 195 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Serialization/ModuleFile.cpp
View File

@@ -69,10 +69,10 @@ Decl *ModuleFile::getDecl(DeclID DID) {
assert(DID <= Decls.size() && "invalid decl ID");
auto &declOrOffset = Decls[DID-1];
if (declOrOffset.isPointer())
return declOrOffset.getPointer();
if (declOrOffset.is<Decl *>())
return declOrOffset.get<Decl *>();
DeclTypeCursor.JumpToBit(declOrOffset.getInt());
DeclTypeCursor.JumpToBit(declOrOffset.get<BitOffset>());
auto entry = DeclTypeCursor.advance();
if (entry.Kind != llvm::BitstreamEntry::Record) {
@@ -130,7 +130,7 @@ Decl *ModuleFile::getDecl(DeclID DID) {
return nullptr;
}
return declOrOffset.getPointer();
return declOrOffset.get<Decl *>();
}
Type ModuleFile::getType(TypeID TID) {
@@ -140,10 +140,10 @@ Type ModuleFile::getType(TypeID TID) {
assert(TID <= Types.size() && "invalid decl ID");
auto &typeOrOffset = Types[TID-1];
if (typeOrOffset.isPointer())
return typeOrOffset.getPointer();
if (typeOrOffset.is<Type>())
return typeOrOffset.get<Type>();
DeclTypeCursor.JumpToBit(typeOrOffset.getInt());
DeclTypeCursor.JumpToBit(typeOrOffset.get<BitOffset>());
auto entry = DeclTypeCursor.advance();
if (entry.Kind != llvm::BitstreamEntry::Record) {
@@ -192,7 +192,7 @@ Type ModuleFile::getType(TypeID TID) {
return nullptr;
}
return typeOrOffset.getPointer();
return typeOrOffset.get<Type>();
}
ModuleFile::ModuleFile(llvm::OwningPtr<llvm::MemoryBuffer> &&input)