RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

make hasAddressTaken() constant time by storing a refcount in BB's subclass data.

Browse Source 
llvm-svn: 85625
This commit is contained in:
Chris Lattner 2009-10-30 22:33:29 +00:00
parent 1c2cbe3945
commit 74ed905748
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/llvm/BasicBlock.h
View File

@ -23,6 +23,7 @@ namespace llvm {
class TerminatorInst; class TerminatorInst;
class LLVMContext; class LLVMContext;
class BlockAddress;
template<> struct ilist_traits<Instruction> template<> struct ilist_traits<Instruction>
: public SymbolTableListTraits<Instruction, BasicBlock> { : public SymbolTableListTraits<Instruction, BasicBlock> {
@ -66,7 +67,7 @@ private:
/// @brief LLVM Basic Block Representation /// @brief LLVM Basic Block Representation
class BasicBlock : public Value, // Basic blocks are data objects also class BasicBlock : public Value, // Basic blocks are data objects also
public ilist_node<BasicBlock> { public ilist_node<BasicBlock> {
friend class BlockAddress;
public: public:
typedef iplist<Instruction> InstListType; typedef iplist<Instruction> InstListType;
private: private:
@ -238,7 +239,15 @@ public:
/// hasAddressTaken - returns true if there are any uses of this basic block /// hasAddressTaken - returns true if there are any uses of this basic block
/// other than direct branches, switches, etc. to it. /// other than direct branches, switches, etc. to it.
bool hasAddressTaken() const; bool hasAddressTaken() const { return SubclassData != 0; }
private:
/// AdjustBlockAddressRefCount - BasicBlock stores the number of BlockAddress
/// objects using it. This is almost always 0, sometimes one, possibly but
/// almost never 2, and inconceivably 3 or more.
void AdjustBlockAddressRefCount(int Amt) {
SubclassData += Amt;
assert((int)(char)SubclassData >= 0 && "Refcount wrap-around");
}
}; };
} // End llvm namespace } // End llvm namespace

8
lib/VMCore/BasicBlock.cpp
View File

@ -278,11 +278,3 @@ BasicBlock *BasicBlock::splitBasicBlock(iterator I, const Twine &BBName) {
return New; return New;
} }
/// hasAddressTaken - returns true if there are any uses of this basic block
/// other than direct branches, switches, etc. to it.
bool BasicBlock::hasAddressTaken() const {
for (Value::use_const_iterator I = use_begin(), E = use_end(); I != E; ++I)
if (isa<BlockAddress>(*I))
return true;
return false;
}

12
lib/VMCore/Constants.cpp
View File

@ -44,7 +44,7 @@ using namespace llvm;
// Constructor to create a '0' constant of arbitrary type... // Constructor to create a '0' constant of arbitrary type...
static const uint64_t zero[2] = {0, 0}; static const uint64_t zero[2] = {0, 0};
Constant* Constant::getNullValue(const Type* Ty) { Constant *Constant::getNullValue(const Type *Ty) {
switch (Ty->getTypeID()) { switch (Ty->getTypeID()) {
case Type::IntegerTyID: case Type::IntegerTyID:
return ConstantInt::get(Ty, 0); return ConstantInt::get(Ty, 0);
@ -72,7 +72,7 @@ Constant* Constant::getNullValue(const Type* Ty) {
} }
} }
Constant* Constant::getIntegerValue(const Type* Ty, const APInt &V) { Constant* Constant::getIntegerValue(const Type *Ty, const APInt &V) {
const Type *ScalarTy = Ty->getScalarType(); const Type *ScalarTy = Ty->getScalarType();
// Create the base integer constant. // Create the base integer constant.
@ -89,13 +89,13 @@ Constant* Constant::getIntegerValue(const Type* Ty, const APInt &V) {
return C; return C;
} }
Constant* Constant::getAllOnesValue(const Type* Ty) { Constant* Constant::getAllOnesValue(const Type *Ty) {
if (const IntegerType* ITy = dyn_cast<IntegerType>(Ty)) if (const IntegerType *ITy = dyn_cast<IntegerType>(Ty))
return ConstantInt::get(Ty->getContext(), return ConstantInt::get(Ty->getContext(),
APInt::getAllOnesValue(ITy->getBitWidth())); APInt::getAllOnesValue(ITy->getBitWidth()));
std::vector<Constant*> Elts; std::vector<Constant*> Elts;
const VectorType* VTy = cast<VectorType>(Ty); const VectorType *VTy = cast<VectorType>(Ty);
Elts.resize(VTy->getNumElements(), getAllOnesValue(VTy->getElementType())); Elts.resize(VTy->getNumElements(), getAllOnesValue(VTy->getElementType()));
assert(Elts[0] && "Not a vector integer type!"); assert(Elts[0] && "Not a vector integer type!");
return cast<ConstantVector>(ConstantVector::get(Elts)); return cast<ConstantVector>(ConstantVector::get(Elts));
@ -1045,6 +1045,7 @@ BlockAddress::BlockAddress(Function *F, BasicBlock *BB)
&Op<0>(), 2) { &Op<0>(), 2) {
Op<0>() = F; Op<0>() = F;
Op<1>() = BB; Op<1>() = BB;
BB->AdjustBlockAddressRefCount(1);
} }
@ -1053,6 +1054,7 @@ BlockAddress::BlockAddress(Function *F, BasicBlock *BB)
void BlockAddress::destroyConstant() { void BlockAddress::destroyConstant() {
getFunction()->getType()->getContext().pImpl getFunction()->getType()->getContext().pImpl
->BlockAddresses.erase(std::make_pair(getFunction(), getBasicBlock())); ->BlockAddresses.erase(std::make_pair(getFunction(), getBasicBlock()));
getBasicBlock()->AdjustBlockAddressRefCount(-1);
destroyConstantImpl(); destroyConstantImpl();
} }