Add User::growHungoffUses and use it to grow the hung off uses. NFC.

PhiNode, SwitchInst, LandingPad and IndirectBr all had virtually identical
logic for growing the hung off uses.
Move it to User so that they can all call a single shared implementation.

Their destructors were all empty after this change and were deleted.  They all
have virtual clone_impl methods which can be used as vtable anchors.

Reviewed by Duncan Exon Smith.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239492 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Pete Cooper 2015-06-10 22:38:41 +00:00
parent 0fa7dc6b36
commit 33102d2faa
3 changed files with 36 additions and 30 deletions

View File

@ -58,6 +58,11 @@ protected:
/// \param IsPhi identifies callers which are phi nodes and which need /// \param IsPhi identifies callers which are phi nodes and which need
/// N BasicBlock* allocated along with N /// N BasicBlock* allocated along with N
Use *allocHungoffUses(unsigned N, bool IsPhi = false); Use *allocHungoffUses(unsigned N, bool IsPhi = false);
/// \brief Grow the number of hung off uses. Note that allocHungoffUses
/// should be called if there are no uses.
void growHungoffUses(unsigned N, bool IsPhi = false);
public: public:
~User() override { ~User() override {
// drop the hung off uses. // drop the hung off uses.

View File

@ -128,16 +128,8 @@ void PHINode::growOperands() {
unsigned NumOps = e + e / 2; unsigned NumOps = e + e / 2;
if (NumOps < 2) NumOps = 2; // 2 op PHI nodes are VERY common. if (NumOps < 2) NumOps = 2; // 2 op PHI nodes are VERY common.
Use *OldOps = op_begin();
BasicBlock **OldBlocks = block_begin();
ReservedSpace = NumOps; ReservedSpace = NumOps;
OperandList = allocHungoffUses(ReservedSpace); growHungoffUses(ReservedSpace, /* IsPhi */ true);
std::copy(OldOps, OldOps + e, op_begin());
std::copy(OldBlocks, OldBlocks + e, block_begin());
Use::zap(OldOps, OldOps + e, true);
} }
/// hasConstantValue - If the specified PHI node always merges together the same /// hasConstantValue - If the specified PHI node always merges together the same
@ -218,14 +210,7 @@ void LandingPadInst::growOperands(unsigned Size) {
unsigned e = getNumOperands(); unsigned e = getNumOperands();
if (ReservedSpace >= e + Size) return; if (ReservedSpace >= e + Size) return;
ReservedSpace = (e + Size / 2) * 2; ReservedSpace = (e + Size / 2) * 2;
growHungoffUses(ReservedSpace);
Use *NewOps = allocHungoffUses(ReservedSpace);
Use *OldOps = OperandList;
for (unsigned i = 0; i != e; ++i)
NewOps[i] = OldOps[i];
OperandList = NewOps;
Use::zap(OldOps, OldOps + e, true);
} }
void LandingPadInst::addClause(Constant *Val) { void LandingPadInst::addClause(Constant *Val) {
@ -3363,13 +3348,7 @@ void SwitchInst::growOperands() {
unsigned NumOps = e*3; unsigned NumOps = e*3;
ReservedSpace = NumOps; ReservedSpace = NumOps;
Use *NewOps = allocHungoffUses(NumOps); growHungoffUses(ReservedSpace);
Use *OldOps = OperandList;
for (unsigned i = 0; i != e; ++i) {
NewOps[i] = OldOps[i];
}
OperandList = NewOps;
Use::zap(OldOps, OldOps + e, true);
} }
@ -3406,12 +3385,7 @@ void IndirectBrInst::growOperands() {
unsigned NumOps = e*2; unsigned NumOps = e*2;
ReservedSpace = NumOps; ReservedSpace = NumOps;
Use *NewOps = allocHungoffUses(NumOps); growHungoffUses(ReservedSpace);
Use *OldOps = OperandList;
for (unsigned i = 0; i != e; ++i)
NewOps[i] = OldOps[i];
OperandList = NewOps;
Use::zap(OldOps, OldOps + e, true);
} }
IndirectBrInst::IndirectBrInst(Value *Address, unsigned NumCases, IndirectBrInst::IndirectBrInst(Value *Address, unsigned NumCases,

View File

@ -56,6 +56,33 @@ Use *User::allocHungoffUses(unsigned N, bool IsPhi) {
return Uses; return Uses;
} }
void User::growHungoffUses(unsigned NewNumUses, bool IsPhi) {
assert(HasHungOffUses && "realloc must have hung off uses");
unsigned OldNumUses = getNumOperands();
// We don't support shrinking the number of uses. We wouldn't have enough
// space to copy the old uses in to the new space.
assert(NewNumUses > OldNumUses && "realloc must grow num uses");
Use *OldOps = OperandList;
allocHungoffUses(NewNumUses, IsPhi);
Use *NewOps = OperandList;
// Now copy from the old operands list to the new one.
std::copy(OldOps, OldOps + OldNumUses, NewOps);
// If this is a Phi, then we need to copy the BB pointers too.
if (IsPhi) {
auto *OldPtr =
reinterpret_cast<char *>(OldOps + OldNumUses) + sizeof(Use::UserRef);
auto *NewPtr =
reinterpret_cast<char *>(NewOps + NewNumUses) + sizeof(Use::UserRef);
std::copy(OldPtr, OldPtr + (OldNumUses * sizeof(BasicBlock *)), NewPtr);
}
Use::zap(OldOps, OldOps + OldNumUses, true);
}
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// User operator new Implementations // User operator new Implementations
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//