[llvm-commits] [llvm] r78012 - in /llvm/trunk: include/llvm/Metadata.h lib/VMCore/Metadata.cpp
Devang Patel
dpatel at apple.com
Mon Aug 3 15:51:10 PDT 2009
Author: dpatel
Date: Mon Aug 3 17:51:10 2009
New Revision: 78012
URL: http://llvm.org/viewvc/llvm-project?rev=78012&view=rev
Log:
Keep track of metadata used by other metadata.
Modified:
llvm/trunk/include/llvm/Metadata.h
llvm/trunk/lib/VMCore/Metadata.cpp
Modified: llvm/trunk/include/llvm/Metadata.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Metadata.h?rev=78012&r1=78011&r2=78012&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Metadata.h (original)
+++ llvm/trunk/include/llvm/Metadata.h Mon Aug 3 17:51:10 2009
@@ -16,7 +16,7 @@
#ifndef LLVM_MDNODE_H
#define LLVM_MDNODE_H
-#include "llvm/Value.h"
+#include "llvm/User.h"
#include "llvm/Type.h"
#include "llvm/OperandTraits.h"
#include "llvm/ADT/FoldingSet.h"
@@ -31,11 +31,17 @@
//===----------------------------------------------------------------------===//
// MetadataBase - A base class for MDNode, MDString and NamedMDNode.
-class MetadataBase : public Value {
+class MetadataBase : public User {
+private:
+ /// ReservedSpace - The number of operands actually allocated. NumOperands is
+ /// the number actually in use.
+ unsigned ReservedSpace;
+
protected:
MetadataBase(const Type *Ty, unsigned scid)
- : Value(Ty, scid) {}
+ : User(Ty, scid, NULL, 0), ReservedSpace(0) {}
+ void resizeOperands(unsigned NumOps);
public:
/// getType() specialization - Type is always MetadataTy.
///
@@ -64,13 +70,19 @@
/// MDString is always unnamd.
class MDString : public MetadataBase {
MDString(const MDString &); // DO NOT IMPLEMENT
- StringRef Str;
+ void *operator new(size_t, unsigned); // DO NOT IMPLEMENT
+ unsigned getNumOperands(); // DO NOT IMPLEMENT
+ StringRef Str;
protected:
explicit MDString(const char *begin, unsigned l)
: MetadataBase(Type::MetadataTy, Value::MDStringVal), Str(begin, l) {}
public:
+ // Do not allocate any space for operands.
+ void *operator new(size_t s) {
+ return User::operator new(s, 0);
+ }
static MDString *get(LLVMContext &Context, const StringRef &Str);
StringRef getString() const { return Str; }
@@ -97,38 +109,49 @@
/// These contain a list of the values that represent the metadata.
/// MDNode is always unnamed.
class MDNode : public MetadataBase, public FoldingSetNode {
- MDNode(const MDNode &); // DO NOT IMPLEMENT
+ MDNode(const MDNode &); // DO NOT IMPLEMENT
+ void *operator new(size_t, unsigned); // DO NOT IMPLEMENT
+ // getNumOperands - Make this only available for private uses.
+ unsigned getNumOperands() { return User::getNumOperands(); }
SmallVector<WeakVH, 4> Node;
- typedef SmallVectorImpl<WeakVH>::iterator elem_iterator;
-
protected:
explicit MDNode(Value*const* Vals, unsigned NumVals);
public:
+ // Do not allocate any space for operands.
+ void *operator new(size_t s) {
+ return User::operator new(s, 0);
+ }
+ // Constructors and destructors.
static MDNode *get(LLVMContext &Context,
Value* const* Vals, unsigned NumVals);
-
- typedef SmallVectorImpl<WeakVH>::const_iterator const_elem_iterator;
+ /// dropAllReferences - Remove all uses and clear node vector.
+ void dropAllReferences();
+
+ /// ~MDNode - Destroy NamedMDNode.
+ ~MDNode();
+
+ /// getElement - Return specified element.
Value *getElement(unsigned i) const {
+ assert (getNumElements() > i && "Invalid element number!");
return Node[i];
}
+ /// getNumElements - Return number of MDNode elements.
unsigned getNumElements() const {
return Node.size();
}
- bool elem_empty() const {
- return Node.empty();
- }
-
- const_elem_iterator elem_begin() const {
- return Node.begin();
- }
-
- const_elem_iterator elem_end() const {
- return Node.end();
- }
+ // Element access
+ typedef SmallVectorImpl<WeakVH>::const_iterator const_elem_iterator;
+ typedef SmallVectorImpl<WeakVH>::iterator elem_iterator;
+ /// elem_empty - Return true if MDNode is empty.
+ bool elem_empty() const { return Node.empty(); }
+ const_elem_iterator elem_begin() const { return Node.begin(); }
+ const_elem_iterator elem_end() const { return Node.end(); }
+ elem_iterator elem_begin() { return Node.begin(); }
+ elem_iterator elem_end() { return Node.end(); }
/// getType() specialization - Type is always MetadataTy.
///
@@ -183,10 +206,13 @@
class NamedMDNode : public MetadataBase, public ilist_node<NamedMDNode> {
friend class SymbolTableListTraits<NamedMDNode, Module>;
- NamedMDNode(const NamedMDNode &); // DO NOT IMPLEMENT
-
friend class LLVMContextImpl;
+ NamedMDNode(const NamedMDNode &); // DO NOT IMPLEMENT
+ void *operator new(size_t, unsigned); // DO NOT IMPLEMENT
+ // getNumOperands - Make this only available for private uses.
+ unsigned getNumOperands() { return User::getNumOperands(); }
+
Module *Parent;
SmallVector<WeakMetadataVH, 4> Node;
typedef SmallVectorImpl<WeakMetadataVH>::iterator elem_iterator;
@@ -195,6 +221,10 @@
explicit NamedMDNode(const Twine &N, MetadataBase*const* Vals,
unsigned NumVals, Module *M = 0);
public:
+ // Do not allocate any space for operands.
+ void *operator new(size_t s) {
+ return User::operator new(s, 0);
+ }
static NamedMDNode *Create(const Twine &N, MetadataBase*const*MDs,
unsigned NumMDs, Module *M = 0) {
return new NamedMDNode(N, MDs, NumMDs, M);
@@ -207,39 +237,38 @@
/// dropAllReferences - Remove all uses and clear node vector.
void dropAllReferences();
+ /// ~NamedMDNode - Destroy NamedMDNode.
~NamedMDNode();
- typedef SmallVectorImpl<WeakMetadataVH>::const_iterator const_elem_iterator;
-
/// getParent - Get the module that holds this named metadata collection.
inline Module *getParent() { return Parent; }
inline const Module *getParent() const { return Parent; }
void setParent(Module *M) { Parent = M; }
+ /// getElement - Return specified element.
MetadataBase *getElement(unsigned i) const {
+ assert (getNumElements() > i && "Invalid element number!");
return Node[i];
}
+ /// getNumElements - Return number of NamedMDNode elements.
unsigned getNumElements() const {
return Node.size();
}
/// addElement - Add metadata element.
void addElement(MetadataBase *M) {
+ resizeOperands(0);
+ OperandList[NumOperands++] = M;
Node.push_back(WeakMetadataVH(M));
}
- bool elem_empty() const {
- return Node.empty();
- }
-
- const_elem_iterator elem_begin() const {
- return Node.begin();
- }
-
- const_elem_iterator elem_end() const {
- return Node.end();
- }
+ typedef SmallVectorImpl<WeakMetadataVH>::const_iterator const_elem_iterator;
+ bool elem_empty() const { return Node.empty(); }
+ const_elem_iterator elem_begin() const { return Node.begin(); }
+ const_elem_iterator elem_end() const { return Node.end(); }
+ elem_iterator elem_begin() { return Node.begin(); }
+ elem_iterator elem_end() { return Node.end(); }
/// getType() specialization - Type is always MetadataTy.
///
Modified: llvm/trunk/lib/VMCore/Metadata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Metadata.cpp?rev=78012&r1=78011&r2=78012&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Metadata.cpp (original)
+++ llvm/trunk/lib/VMCore/Metadata.cpp Mon Aug 3 17:51:10 2009
@@ -19,6 +19,34 @@
using namespace llvm;
//===----------------------------------------------------------------------===//
+//MetadataBase implementation
+//
+
+/// resizeOperands - Metadata keeps track of other metadata uses using
+/// OperandList. Resize this list to hold anticipated number of metadata
+/// operands.
+void MetadataBase::resizeOperands(unsigned NumOps) {
+ unsigned e = getNumOperands();
+ if (NumOps == 0) {
+ NumOps = e*2;
+ if (NumOps < 2) NumOps = 2;
+ } else if (NumOps > NumOperands) {
+ // No resize needed.
+ if (ReservedSpace >= NumOps) return;
+ } else if (NumOps == NumOperands) {
+ if (ReservedSpace == NumOps) return;
+ } else {
+ return;
+ }
+
+ ReservedSpace = NumOps;
+ Use *OldOps = OperandList;
+ Use *NewOps = allocHungoffUses(NumOps);
+ std::copy(OldOps, OldOps + e, NewOps);
+ OperandList = NewOps;
+ if (OldOps) Use::zap(OldOps, OldOps + e, true);
+}
+//===----------------------------------------------------------------------===//
//MDString implementation
//
MDString *MDString::get(LLVMContext &Context, const StringRef &Str) {
@@ -38,8 +66,14 @@
//
MDNode::MDNode(Value*const* Vals, unsigned NumVals)
: MetadataBase(Type::MetadataTy, Value::MDNodeVal) {
- for (unsigned i = 0; i != NumVals; ++i)
+ NumOperands = 0;
+ resizeOperands(NumVals);
+ for (unsigned i = 0; i != NumVals; ++i) {
+ // Only record metadata uses.
+ if (MetadataBase *MB = dyn_cast_or_null<MetadataBase>(Vals[i]))
+ OperandList[NumOperands++] = MB;
Node.push_back(WeakVH(Vals[i]));
+ }
}
void MDNode::Profile(FoldingSetNodeID &ID) const {
@@ -71,6 +105,15 @@
return N;
}
+/// dropAllReferences - Remove all uses and clear node vector.
+void MDNode::dropAllReferences() {
+ User::dropAllReferences();
+ Node.clear();
+}
+
+MDNode::~MDNode() {
+ dropAllReferences();
+}
//===----------------------------------------------------------------------===//
//NamedMDNode implementation
//
@@ -78,8 +121,14 @@
unsigned NumMDs, Module *ParentModule)
: MetadataBase(Type::MetadataTy, Value::NamedMDNodeVal), Parent(0) {
setName(N);
- for (unsigned i = 0; i != NumMDs; ++i)
+ NumOperands = 0;
+ resizeOperands(NumMDs);
+
+ for (unsigned i = 0; i != NumMDs; ++i) {
+ if (MDs[i])
+ OperandList[NumOperands++] = MDs[i];
Node.push_back(WeakMetadataVH(MDs[i]));
+ }
if (ParentModule)
ParentModule->getNamedMDList().push_back(this);
}
@@ -87,13 +136,12 @@
/// eraseFromParent - Drop all references and remove the node from parent
/// module.
void NamedMDNode::eraseFromParent() {
- dropAllReferences();
getParent()->getNamedMDList().erase(this);
}
/// dropAllReferences - Remove all uses and clear node vector.
void NamedMDNode::dropAllReferences() {
- // FIXME: Update metadata use list.
+ User::dropAllReferences();
Node.clear();
}
More information about the llvm-commits
mailing list