[llvm-commits] [llvm] r85625 - in /llvm/trunk: include/llvm/BasicBlock.h lib/VMCore/BasicBlock.cpp lib/VMCore/Constants.cpp
Chris Lattner
sabre at nondot.org
Fri Oct 30 15:33:29 PDT 2009
Author: lattner
Date: Fri Oct 30 17:33:29 2009
New Revision: 85625
URL: http://llvm.org/viewvc/llvm-project?rev=85625&view=rev
Log:
make hasAddressTaken() constant time by storing a refcount in BB's subclass data.
Modified:
llvm/trunk/include/llvm/BasicBlock.h
llvm/trunk/lib/VMCore/BasicBlock.cpp
llvm/trunk/lib/VMCore/Constants.cpp
Modified: llvm/trunk/include/llvm/BasicBlock.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BasicBlock.h?rev=85625&r1=85624&r2=85625&view=diff
==============================================================================
--- llvm/trunk/include/llvm/BasicBlock.h (original)
+++ llvm/trunk/include/llvm/BasicBlock.h Fri Oct 30 17:33:29 2009
@@ -23,6 +23,7 @@
class TerminatorInst;
class LLVMContext;
+class BlockAddress;
template<> struct ilist_traits<Instruction>
: public SymbolTableListTraits<Instruction, BasicBlock> {
@@ -66,7 +67,7 @@
/// @brief LLVM Basic Block Representation
class BasicBlock : public Value, // Basic blocks are data objects also
public ilist_node<BasicBlock> {
-
+ friend class BlockAddress;
public:
typedef iplist<Instruction> InstListType;
private:
@@ -238,7 +239,15 @@
/// hasAddressTaken - returns true if there are any uses of this basic block
/// 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
Modified: llvm/trunk/lib/VMCore/BasicBlock.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/BasicBlock.cpp?rev=85625&r1=85624&r2=85625&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/BasicBlock.cpp (original)
+++ llvm/trunk/lib/VMCore/BasicBlock.cpp Fri Oct 30 17:33:29 2009
@@ -278,11 +278,3 @@
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;
-}
Modified: llvm/trunk/lib/VMCore/Constants.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Constants.cpp?rev=85625&r1=85624&r2=85625&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Constants.cpp (original)
+++ llvm/trunk/lib/VMCore/Constants.cpp Fri Oct 30 17:33:29 2009
@@ -44,7 +44,7 @@
// Constructor to create a '0' constant of arbitrary type...
static const uint64_t zero[2] = {0, 0};
-Constant* Constant::getNullValue(const Type* Ty) {
+Constant *Constant::getNullValue(const Type *Ty) {
switch (Ty->getTypeID()) {
case Type::IntegerTyID:
return ConstantInt::get(Ty, 0);
@@ -72,7 +72,7 @@
}
}
-Constant* Constant::getIntegerValue(const Type* Ty, const APInt &V) {
+Constant* Constant::getIntegerValue(const Type *Ty, const APInt &V) {
const Type *ScalarTy = Ty->getScalarType();
// Create the base integer constant.
@@ -89,13 +89,13 @@
return C;
}
-Constant* Constant::getAllOnesValue(const Type* Ty) {
- if (const IntegerType* ITy = dyn_cast<IntegerType>(Ty))
+Constant* Constant::getAllOnesValue(const Type *Ty) {
+ if (const IntegerType *ITy = dyn_cast<IntegerType>(Ty))
return ConstantInt::get(Ty->getContext(),
APInt::getAllOnesValue(ITy->getBitWidth()));
std::vector<Constant*> Elts;
- const VectorType* VTy = cast<VectorType>(Ty);
+ const VectorType *VTy = cast<VectorType>(Ty);
Elts.resize(VTy->getNumElements(), getAllOnesValue(VTy->getElementType()));
assert(Elts[0] && "Not a vector integer type!");
return cast<ConstantVector>(ConstantVector::get(Elts));
@@ -1045,6 +1045,7 @@
&Op<0>(), 2) {
Op<0>() = F;
Op<1>() = BB;
+ BB->AdjustBlockAddressRefCount(1);
}
@@ -1053,6 +1054,7 @@
void BlockAddress::destroyConstant() {
getFunction()->getType()->getContext().pImpl
->BlockAddresses.erase(std::make_pair(getFunction(), getBasicBlock()));
+ getBasicBlock()->AdjustBlockAddressRefCount(-1);
destroyConstantImpl();
}
More information about the llvm-commits
mailing list