For PR1136:
Add reference counting to ParamAttrsList and make use of it in Function, CallInst and InvokeInst classes. llvm-svn: 36346
This commit is contained in:
parent
380058025b
commit
c6a83847a2
|
@ -128,7 +128,7 @@ public:
|
||||||
/// Sets the parameter attributes for this Function. To construct a
|
/// Sets the parameter attributes for this Function. To construct a
|
||||||
/// ParamAttrsList, see ParameterAttributes.h
|
/// ParamAttrsList, see ParameterAttributes.h
|
||||||
/// @brief Set the parameter attributes.
|
/// @brief Set the parameter attributes.
|
||||||
void setParamAttrs(ParamAttrsList *attrs) { ParamAttrs = attrs; }
|
void setParamAttrs(ParamAttrsList *attrs);
|
||||||
|
|
||||||
/// deleteBody - This method deletes the body of the function, and converts
|
/// deleteBody - This method deletes the body of the function, and converts
|
||||||
/// the linkage to external.
|
/// the linkage to external.
|
||||||
|
|
|
@ -751,7 +751,7 @@ public:
|
||||||
/// Sets the parameter attributes for this CallInst. To construct a
|
/// Sets the parameter attributes for this CallInst. To construct a
|
||||||
/// ParamAttrsList, see ParameterAttributes.h
|
/// ParamAttrsList, see ParameterAttributes.h
|
||||||
/// @brief Set the parameter attributes.
|
/// @brief Set the parameter attributes.
|
||||||
void setParamAttrs(ParamAttrsList *attrs) { ParamAttrs = attrs; }
|
void setParamAttrs(ParamAttrsList *attrs);
|
||||||
|
|
||||||
/// getCalledFunction - Return the function being called by this instruction
|
/// getCalledFunction - Return the function being called by this instruction
|
||||||
/// if it is a direct call. If it is a call through a function pointer,
|
/// if it is a direct call. If it is a call through a function pointer,
|
||||||
|
@ -1482,7 +1482,7 @@ public:
|
||||||
/// Sets the parameter attributes for this InvokeInst. To construct a
|
/// Sets the parameter attributes for this InvokeInst. To construct a
|
||||||
/// ParamAttrsList, see ParameterAttributes.h
|
/// ParamAttrsList, see ParameterAttributes.h
|
||||||
/// @brief Set the parameter attributes.
|
/// @brief Set the parameter attributes.
|
||||||
void setParamAttrs(ParamAttrsList *attrs) { ParamAttrs = attrs; }
|
void setParamAttrs(ParamAttrsList *attrs);
|
||||||
|
|
||||||
/// getCalledFunction - Return the function called, or null if this is an
|
/// getCalledFunction - Return the function called, or null if this is an
|
||||||
/// indirect function invocation.
|
/// indirect function invocation.
|
||||||
|
|
|
@ -21,13 +21,13 @@
|
||||||
#include "llvm/ADT/FoldingSet.h"
|
#include "llvm/ADT/FoldingSet.h"
|
||||||
|
|
||||||
namespace llvm {
|
namespace llvm {
|
||||||
|
|
||||||
/// Function parameters can have attributes to indicate how they should be
|
|
||||||
/// treated by optimizations and code generation. This enumeration lists the
|
|
||||||
/// attributes that can be associated with parameters or function results.
|
|
||||||
/// @brief Function parameter attributes.
|
|
||||||
namespace ParamAttr {
|
namespace ParamAttr {
|
||||||
|
|
||||||
|
/// Function parameters and results can have attributes to indicate how they
|
||||||
|
/// should be treated by optimizations and code generation. This enumeration
|
||||||
|
/// lists the attributes that can be associated with parameters or function
|
||||||
|
/// results.
|
||||||
|
/// @brief Function parameter attributes.
|
||||||
enum Attributes {
|
enum Attributes {
|
||||||
None = 0, ///< No attributes have been set
|
None = 0, ///< No attributes have been set
|
||||||
ZExt = 1 << 0, ///< zero extended before/after call
|
ZExt = 1 << 0, ///< zero extended before/after call
|
||||||
|
@ -41,7 +41,7 @@ enum Attributes {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// This is just a pair of values to associate a set of parameter attributes
|
/// This is just a pair of values to associate a set of parameter attributes
|
||||||
/// with a parameter index.
|
/// with a parameter index.
|
||||||
/// @brief ParameterAttributes with a parameter index.
|
/// @brief ParameterAttributes with a parameter index.
|
||||||
struct ParamAttrsWithIndex {
|
struct ParamAttrsWithIndex {
|
||||||
uint16_t attrs; ///< The attributes that are set, |'d together
|
uint16_t attrs; ///< The attributes that are set, |'d together
|
||||||
|
@ -51,29 +51,43 @@ struct ParamAttrsWithIndex {
|
||||||
/// @brief A vector of attribute/index pairs.
|
/// @brief A vector of attribute/index pairs.
|
||||||
typedef SmallVector<ParamAttrsWithIndex,4> ParamAttrsVector;
|
typedef SmallVector<ParamAttrsWithIndex,4> ParamAttrsVector;
|
||||||
|
|
||||||
|
/// @brief A more friendly way to reference the attributes.
|
||||||
typedef ParamAttr::Attributes ParameterAttributes;
|
typedef ParamAttr::Attributes ParameterAttributes;
|
||||||
|
|
||||||
/// This class is used by Function and CallInst to represent the set of
|
/// This class represents a list of attribute/index pairs for parameter
|
||||||
/// parameter attributes used. It represents a list of pairs of uint16_t, one
|
/// attributes. Each entry in the list contains the index of a function
|
||||||
/// for the parameter index, and one a set of ParameterAttributes bits.
|
/// parameter and the associated ParameterAttributes. If a parameter's index is
|
||||||
/// Parameters that have no attributes are not present in the list. The list
|
/// not present in the list, then no attributes are set for that parameter. The
|
||||||
/// may also be empty, but this doesn't occur in practice. The list constructs
|
/// list may also be empty, but this does not occur in practice. An item in
|
||||||
/// as empty and is filled by the insert method. The list can be turned into
|
/// the list with an index of 0 refers to the function as a whole or its result.
|
||||||
/// a string of mnemonics suitable for LLVM Assembly output. Various accessors
|
/// To construct a ParamAttrsList, you must first fill a ParamAttrsVector with
|
||||||
/// are provided to obtain information about the attributes.
|
/// the attribute/index pairs you wish to set. The list of attributes can be
|
||||||
|
/// turned into a string of mnemonics suitable for LLVM Assembly output.
|
||||||
|
/// Various accessors are provided to obtain information about the attributes.
|
||||||
|
/// Note that objects of this class are "uniqued". The \p get method can return
|
||||||
|
/// the pointer of an existing and identical instance. Consequently, reference
|
||||||
|
/// counting is necessary in order to determine when the last reference to a
|
||||||
|
/// ParamAttrsList of a given shape is dropped. Users of this class should use
|
||||||
|
/// the addRef and dropRef methods to add/drop references. When the reference
|
||||||
|
/// count goes to zero, the ParamAttrsList object is deleted.
|
||||||
|
/// This class is used by Function, CallInst and InvokeInst to represent their
|
||||||
|
/// sets of parameter attributes.
|
||||||
/// @brief A List of ParameterAttributes.
|
/// @brief A List of ParameterAttributes.
|
||||||
class ParamAttrsList : public FoldingSetNode {
|
class ParamAttrsList : public FoldingSetNode {
|
||||||
/// @name Construction
|
/// @name Construction
|
||||||
/// @{
|
/// @{
|
||||||
private:
|
private:
|
||||||
// ParamAttrsList is uniqued, thes should not be publicly available
|
// ParamAttrsList is uniqued, these should not be publicly available
|
||||||
void operator=(const ParamAttrsList &); // Do not implement
|
void operator=(const ParamAttrsList &); // Do not implement
|
||||||
ParamAttrsList(const ParamAttrsList &); // Do not implement
|
ParamAttrsList(const ParamAttrsList &); // Do not implement
|
||||||
ParamAttrsList(); // Do not implement
|
ParamAttrsList(); // Do not implement
|
||||||
~ParamAttrsList() {} // Not public!
|
~ParamAttrsList(); // Private implementation
|
||||||
|
|
||||||
|
/// Only the \p get method can invoke this when it wants to create a
|
||||||
|
/// new instance.
|
||||||
/// @brief Construct an ParamAttrsList from a ParamAttrsVector
|
/// @brief Construct an ParamAttrsList from a ParamAttrsVector
|
||||||
explicit ParamAttrsList(const ParamAttrsVector &attrVec) : attrs(attrVec) {}
|
explicit ParamAttrsList(const ParamAttrsVector &attrVec)
|
||||||
|
: attrs(attrVec), refCount(0) {}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/// This method ensures the uniqueness of ParamAttrsList instances. The
|
/// This method ensures the uniqueness of ParamAttrsList instances. The
|
||||||
|
@ -156,6 +170,23 @@ class ParamAttrsList : public FoldingSetNode {
|
||||||
/// @brief Return the number of parameter attributes this type has.
|
/// @brief Return the number of parameter attributes this type has.
|
||||||
unsigned size() const { return attrs.size(); }
|
unsigned size() const { return attrs.size(); }
|
||||||
|
|
||||||
|
/// Classes retaining references to ParamAttrsList objects should call this
|
||||||
|
/// method to increment the reference count. This ensures that the
|
||||||
|
/// ParamAttrsList object will not disappear until the class drops it.
|
||||||
|
/// @brief Add a reference to this instance.
|
||||||
|
void addRef() const { refCount++; }
|
||||||
|
|
||||||
|
/// Classes retaining references to ParamAttrsList objects should call this
|
||||||
|
/// method to decrement the reference count and possibly delete the
|
||||||
|
/// ParamAttrsList object. This ensures that ParamAttrsList objects are
|
||||||
|
/// cleaned up only when the last reference to them is dropped.
|
||||||
|
/// @brief Drop a reference to this instance.
|
||||||
|
void dropRef() const {
|
||||||
|
assert(refCount != 0 && "dropRef without addRef");
|
||||||
|
if (--refCount == 0)
|
||||||
|
delete this;
|
||||||
|
}
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
/// @name Implementation Details
|
/// @name Implementation Details
|
||||||
/// @{
|
/// @{
|
||||||
|
@ -167,7 +198,8 @@ class ParamAttrsList : public FoldingSetNode {
|
||||||
/// @name Data
|
/// @name Data
|
||||||
/// @{
|
/// @{
|
||||||
private:
|
private:
|
||||||
ParamAttrsVector attrs; ///< The list of attributes
|
ParamAttrsVector attrs; ///< The list of attributes
|
||||||
|
mutable unsigned refCount; ///< The number of references to this object
|
||||||
/// @}
|
/// @}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -129,6 +129,10 @@ ParamAttrsList::get(const ParamAttrsVector &attrVec) {
|
||||||
return PAL;
|
return PAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ParamAttrsList::~ParamAttrsList() {
|
||||||
|
ParamAttrsLists->RemoveNode(this);
|
||||||
|
}
|
||||||
|
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
// Function Implementation
|
// Function Implementation
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
@ -162,6 +166,10 @@ Function::~Function() {
|
||||||
// Delete all of the method arguments and unlink from symbol table...
|
// Delete all of the method arguments and unlink from symbol table...
|
||||||
ArgumentList.clear();
|
ArgumentList.clear();
|
||||||
delete SymTab;
|
delete SymTab;
|
||||||
|
|
||||||
|
// Drop our reference to the parameter attributes, if any.
|
||||||
|
if (ParamAttrs)
|
||||||
|
ParamAttrs->dropRef();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Function::setParent(Module *parent) {
|
void Function::setParent(Module *parent) {
|
||||||
|
@ -172,6 +180,16 @@ void Function::setParent(Module *parent) {
|
||||||
LeakDetector::removeGarbageObject(this);
|
LeakDetector::removeGarbageObject(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Function::setParamAttrs(ParamAttrsList *attrs) {
|
||||||
|
if (ParamAttrs)
|
||||||
|
ParamAttrs->dropRef();
|
||||||
|
|
||||||
|
if (attrs)
|
||||||
|
attrs->addRef();
|
||||||
|
|
||||||
|
ParamAttrs = attrs;
|
||||||
|
}
|
||||||
|
|
||||||
const FunctionType *Function::getFunctionType() const {
|
const FunctionType *Function::getFunctionType() const {
|
||||||
return cast<FunctionType>(getType()->getElementType());
|
return cast<FunctionType>(getType()->getElementType());
|
||||||
}
|
}
|
||||||
|
|
|
@ -186,6 +186,8 @@ Value *PHINode::hasConstantValue(bool AllowNonDominatingInstruction) const {
|
||||||
|
|
||||||
CallInst::~CallInst() {
|
CallInst::~CallInst() {
|
||||||
delete [] OperandList;
|
delete [] OperandList;
|
||||||
|
if (ParamAttrs)
|
||||||
|
ParamAttrs->dropRef();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CallInst::init(Value *Func, Value* const *Params, unsigned NumParams) {
|
void CallInst::init(Value *Func, Value* const *Params, unsigned NumParams) {
|
||||||
|
@ -346,6 +348,15 @@ CallInst::CallInst(const CallInst &CI)
|
||||||
OL[i].init(InOL[i], this);
|
OL[i].init(InOL[i], this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CallInst::setParamAttrs(ParamAttrsList *newAttrs) {
|
||||||
|
if (ParamAttrs)
|
||||||
|
ParamAttrs->dropRef();
|
||||||
|
|
||||||
|
if (newAttrs)
|
||||||
|
newAttrs->addRef();
|
||||||
|
|
||||||
|
ParamAttrs = newAttrs;
|
||||||
|
}
|
||||||
|
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
// InvokeInst Implementation
|
// InvokeInst Implementation
|
||||||
|
@ -353,6 +364,8 @@ CallInst::CallInst(const CallInst &CI)
|
||||||
|
|
||||||
InvokeInst::~InvokeInst() {
|
InvokeInst::~InvokeInst() {
|
||||||
delete [] OperandList;
|
delete [] OperandList;
|
||||||
|
if (ParamAttrs)
|
||||||
|
ParamAttrs->dropRef();
|
||||||
}
|
}
|
||||||
|
|
||||||
void InvokeInst::init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException,
|
void InvokeInst::init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException,
|
||||||
|
@ -422,6 +435,15 @@ void InvokeInst::setSuccessorV(unsigned idx, BasicBlock *B) {
|
||||||
return setSuccessor(idx, B);
|
return setSuccessor(idx, B);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void InvokeInst::setParamAttrs(ParamAttrsList *newAttrs) {
|
||||||
|
if (ParamAttrs)
|
||||||
|
ParamAttrs->dropRef();
|
||||||
|
|
||||||
|
if (newAttrs)
|
||||||
|
newAttrs->addRef();
|
||||||
|
|
||||||
|
ParamAttrs = newAttrs;
|
||||||
|
}
|
||||||
|
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
// ReturnInst Implementation
|
// ReturnInst Implementation
|
||||||
|
|
Loading…
Reference in New Issue