//===----------------------------------------------------------------------===//
void Use::swap(Use &RHS) {
- ptrdiff_t dist((char*)&RHS - (char*)this);
-
- if (dist) {
- Use *valid1(stripTag<tagMaskN>(Next));
- Use *valid2(stripTag<tagMaskN>(RHS.Next));
- if (valid1 && valid2) {
- bool real1(fullStopTagN != extractTag<NextPtrTag, tagMaskN>(Next));
- bool real2(fullStopTagN != extractTag<NextPtrTag, tagMaskN>(RHS.Next));
- (char*&)*stripTag<tagMask>(Prev) += dist;
- (char*&)*stripTag<tagMask>(RHS.Prev) -= dist;
- if (real1)
- (char*&)valid1->Next += dist;
- if (real2)
- (char*&)valid2->Next -= dist;
-
- }
-
- // swap the members
- std::swap(Next, RHS.Next);
- Use** Prev1 = transferTag<tagMask>(Prev, stripTag<tagMask>(RHS.Prev));
- RHS.Prev = transferTag<tagMask>(RHS.Prev, stripTag<tagMask>(Prev));
- Prev = Prev1;
- }
- /* Value *V1(Val1);
- Value *V2(RHS.Val1);
+ Value *V1(Val);
+ Value *V2(RHS.Val);
if (V1 != V2) {
if (V1) {
removeFromList();
if (V2) {
RHS.removeFromList();
- Val1 = V2;
+ Val = V2;
V2->addUse(*this);
} else {
- Val1 = 0;
+ Val = 0;
}
if (V1) {
- RHS.Val1 = V1;
+ RHS.Val = V1;
V1->addUse(RHS);
} else {
- RHS.Val1 = 0;
+ RHS.Val = 0;
}
}
- */
}
//===----------------------------------------------------------------------===//
const Use *Current = this;
while (true) {
- unsigned Tag = extractTag<PrevPtrTag, tagMask>((Current++)->Prev);
+ unsigned Tag = (Current++)->Prev.getInt();
switch (Tag) {
case zeroDigitTag:
case oneDigitTag:
++Current;
ptrdiff_t Offset = 1;
while (true) {
- unsigned Tag = extractTag<PrevPtrTag, tagMask>(Current->Prev);
+ unsigned Tag = Current->Prev.getInt();
switch (Tag) {
case zeroDigitTag:
case oneDigitTag:
ptrdiff_t Count = Done;
while (Start != Stop) {
--Stop;
- Stop->Val1 = 0;
- Stop->Next = nilUse(0);
+ Stop->Val = 0;
if (!Count) {
- Stop->Prev = reinterpret_cast<Use**>(Done == 0 ? fullStopTag : stopTag);
+ Stop->Prev.setFromOpaqueValue(reinterpret_cast<Use**>(Done == 0
+ ? fullStopTag
+ : stopTag));
++Done;
Count = Done;
} else {
- Stop->Prev = reinterpret_cast<Use**>(Count & 1);
+ Stop->Prev.setFromOpaqueValue(reinterpret_cast<Use**>(Count & 1));
Count >>= 1;
++Done;
}
//===----------------------------------------------------------------------===//
struct AugmentedUse : Use {
- User *ref;
+ PointerIntPair<User*, 1, Tag> ref;
AugmentedUse(); // not implemented
};
User *Use::getUser() const {
const Use *End = getImpliedUser();
- User *She = static_cast<const AugmentedUse*>(End - 1)->ref;
- She = extractTag<Tag, tagOne>(She)
- ? llvm::stripTag<tagOne>(She)
- : reinterpret_cast<User*>(const_cast<Use*>(End));
-
- return She;
+ const PointerIntPair<User*, 1, Tag>& ref(
+ static_cast<const AugmentedUse*>(End - 1)->ref);
+ User *She = ref.getPointer();
+ return ref.getInt()
+ ? She
+ : (User*)End;
}
//===----------------------------------------------------------------------===//
+ sizeof(AugmentedUse)
- sizeof(Use)));
Use *End = Begin + N;
- static_cast<AugmentedUse&>(End[-1]).ref = addTag(this, tagOne);
+ PointerIntPair<User*, 1, Tag>& ref(static_cast<AugmentedUse&>(End[-1]).ref);
+ ref.setPointer(const_cast<User*>(this));
+ ref.setInt(tagOne);
return Use::initTags(Begin, End);
}