replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a few places where PointerIntPair was using PointerLikeTypeTraits<PointerTy> 

instead of the PtrTraits provided.  Allows PointerIntPair to contain a
PointerUnion safely, as long as the bits add up.

llvm-svn: 82163
This commit is contained in:
John McCall 2009-09-17 20:35:18 +00:00
parent 691a0c45d2
commit 26a96b0369
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/include/llvm/ADT/PointerIntPair.h
View File

@ -65,7 +65,8 @@ public:
}
PointerTy getPointer() const {
return reinterpret_cast<PointerTy>(Value & PointerBitMask);
return PtrTraits::getFromVoidPointer(
reinterpret_cast<void*>(Value & PointerBitMask));
}
IntType getInt() const {
@ -73,7 +74,8 @@ public:
}
void setPointer(PointerTy Ptr) {
intptr_t PtrVal = reinterpret_cast<intptr_t>(Ptr);
intptr_t PtrVal
= reinterpret_cast<intptr_t>(PtrTraits::getAsVoidPointer(Ptr));
assert((PtrVal & ((1 << PtrTraits::NumLowBitsAvailable)-1)) == 0 &&
"Pointer is not sufficiently aligned");
// Preserve all low bits, just update the pointer.
@ -141,8 +143,7 @@ public:
return PointerIntPair<PointerTy, IntBits, IntType>::getFromOpaqueValue(P);
}
enum {
NumLowBitsAvailable =
PointerLikeTypeTraits<PointerTy>::NumLowBitsAvailable - IntBits
NumLowBitsAvailable = PtrTraits::NumLowBitsAvailable - IntBits
};
};