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

Merge pull request #1254 from jrose-apple/Fixnum

Browse Source 
Replace uses of llvm::Fixnum with llvm::PointerEmbeddedInt.
This commit is contained in:
Jordan Rose
2016-02-11 13:06:45 -08:00
parent 9aa3d01101 36a44cf308
commit e7e0a87db2
13 changed files with 79 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/swift/Serialization/ModuleFile.h
View File

@@ -25,7 +25,6 @@
#include "swift/Basic/LLVM.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/Fixnum.h"
#include "llvm/ADT/TinyPtrVector.h"
#include "llvm/Bitcode/BitstreamReader.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -199,7 +198,9 @@ public:
: Value(), Offset(offset), IsFullyDeserialized(0) {}
/*implicit*/ PartiallySerialized(RawBitOffset offset)
: Value(), Offset(offset), IsFullyDeserialized(0) {}
: Value(), Offset(static_cast<unsigned>(offset)), IsFullyDeserialized(0) {
assert(Offset == offset && "offset is too large");
}
bool isDeserialized() const {
return Value != T();
@@ -257,7 +258,9 @@ private:
template <typename IntTy>
/*implicit*/ SerializedIdentifier(IntTy rawOffset)
: Offset(rawOffset) {}
: Offset(static_cast<unsigned>(rawOffset)) {
assert(Offset == rawOffset && "not enough bits");
}
};
/// Identifiers referenced by this module.