[llvm-commits] [llvm] r77476 - in /llvm/trunk: include/llvm/Metadata.h include/llvm/Module.h include/llvm/ValueSymbolTable.h lib/VMCore/Metadata.cpp lib/VMCore/Module.cpp lib/VMCore/Value.cpp
Devang Patel
dpatel at apple.com
Wed Jul 29 10:16:18 PDT 2009
Author: dpatel
Date: Wed Jul 29 12:16:17 2009
New Revision: 77476
URL: http://llvm.org/viewvc/llvm-project?rev=77476&view=rev
Log:
Keep track of named mdnodes in a Module using an ilist.
Modified:
llvm/trunk/include/llvm/Metadata.h
llvm/trunk/include/llvm/Module.h
llvm/trunk/include/llvm/ValueSymbolTable.h
llvm/trunk/lib/VMCore/Metadata.cpp
llvm/trunk/lib/VMCore/Module.cpp
llvm/trunk/lib/VMCore/Value.cpp
Modified: llvm/trunk/include/llvm/Metadata.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Metadata.h?rev=77476&r1=77475&r2=77476&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Metadata.h (original)
+++ llvm/trunk/include/llvm/Metadata.h Wed Jul 29 12:16:17 2009
@@ -18,8 +18,10 @@
#include "llvm/Value.h"
#include "llvm/Type.h"
+#include "llvm/OperandTraits.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/ilist_node.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/ValueHandle.h"
@@ -173,7 +175,11 @@
//===----------------------------------------------------------------------===//
/// NamedMDNode - a tuple of other metadata.
/// NamedMDNode is always named. All NamedMDNode element has a type of metadata.
-class NamedMDNode : public MetadataBase {
+template<typename ValueSubClass, typename ItemParentClass>
+ class SymbolTableListTraits;
+
+class NamedMDNode : public MetadataBase, public ilist_node<NamedMDNode> {
+ friend class SymbolTableListTraits<NamedMDNode, Module>;
NamedMDNode(const NamedMDNode &); // DO NOT IMPLEMENT
friend class LLVMContextImpl;
@@ -201,6 +207,7 @@
/// 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; }
Value *getElement(unsigned i) const {
return Node[i];
Modified: llvm/trunk/include/llvm/Module.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Module.h?rev=77476&r1=77475&r2=77476&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Module.h (original)
+++ llvm/trunk/include/llvm/Module.h Wed Jul 29 12:16:17 2009
@@ -18,6 +18,7 @@
#include "llvm/Function.h"
#include "llvm/GlobalVariable.h"
#include "llvm/GlobalAlias.h"
+#include "llvm/Metadata.h"
#include "llvm/Support/DataTypes.h"
#include <vector>
@@ -56,6 +57,21 @@
static GlobalAlias *createSentinel();
static void destroySentinel(GlobalAlias *GA) { delete GA; }
};
+template<> struct ilist_traits<NamedMDNode>
+ : public SymbolTableListTraits<NamedMDNode, Module> {
+ // createSentinel is used to get hold of a node that marks the end of
+ // the list...
+ NamedMDNode *createSentinel() const {
+ return static_cast<NamedMDNode*>(&Sentinel);
+ }
+ static void destroySentinel(NamedMDNode*) {}
+
+ NamedMDNode *provideInitialHead() const { return createSentinel(); }
+ NamedMDNode *ensureHead(NamedMDNode*) const { return createSentinel(); }
+ static void noteHead(NamedMDNode*, NamedMDNode*) {}
+private:
+ mutable ilist_node<NamedMDNode> Sentinel;
+};
/// A Module instance is used to store all the information related to an
/// LLVM module. Modules are the top level container of all other LLVM
@@ -78,25 +94,31 @@
typedef iplist<Function> FunctionListType;
/// The type for the list of aliases.
typedef iplist<GlobalAlias> AliasListType;
+ /// The type for the list of named metadata.
+ typedef iplist<NamedMDNode> NamedMDListType;
/// The type for the list of dependent libraries.
typedef std::vector<std::string> LibraryListType;
/// The Global Variable iterator.
- typedef GlobalListType::iterator global_iterator;
+ typedef GlobalListType::iterator global_iterator;
/// The Global Variable constant iterator.
- typedef GlobalListType::const_iterator const_global_iterator;
+ typedef GlobalListType::const_iterator const_global_iterator;
/// The Function iterators.
- typedef FunctionListType::iterator iterator;
+ typedef FunctionListType::iterator iterator;
/// The Function constant iterator
- typedef FunctionListType::const_iterator const_iterator;
+ typedef FunctionListType::const_iterator const_iterator;
/// The Global Alias iterators.
- typedef AliasListType::iterator alias_iterator;
+ typedef AliasListType::iterator alias_iterator;
/// The Global Alias constant iterator
- typedef AliasListType::const_iterator const_alias_iterator;
+ typedef AliasListType::const_iterator const_alias_iterator;
+ /// The named metadata iterators.
+ typedef NamedMDListType::iterator named_metadata_iterator;
+ /// The named metadata constant interators.
+ typedef NamedMDListType::const_iterator const_named_metadata_iterator;
/// The Library list iterator.
typedef LibraryListType::const_iterator lib_iterator;
@@ -116,6 +138,7 @@
FunctionListType FunctionList; ///< The Functions in the module
AliasListType AliasList; ///< The Aliases in the module
LibraryListType LibraryList; ///< The Libraries needed by the module
+ NamedMDListType NamedMDList; ///< The named metadata in the module
std::string GlobalScopeAsm; ///< Inline Asm at global scope.
ValueSymbolTable *ValSymTab; ///< Symbol table for values
TypeSymbolTable *TypeSymTab; ///< Symbol table for types
@@ -277,6 +300,15 @@
GlobalAlias *getNamedAlias(const StringRef &Name) const;
/// @}
+/// @name Named Metadata Accessors
+/// @{
+public:
+ /// getNamedMetadata - Return the first named MDNode in the module with the
+ /// specified name. This method returns null if a MDNode with the specified
+ /// name is not found.
+ NamedMDNode *getNamedMetadata(const StringRef &Name) const;
+
+/// @}
/// @name Type Accessors
/// @{
public:
@@ -318,6 +350,13 @@
static iplist<GlobalAlias> Module::*getSublistAccess(GlobalAlias*) {
return &Module::AliasList;
}
+ /// Get the Module's list of named metadata (constant).
+ const NamedMDListType &getNamedMDList() const { return NamedMDList; }
+ /// Get the Module's list of named metadata.
+ NamedMDListType &getNamedMDList() { return NamedMDList; }
+ static iplist<NamedMDNode> Module::*getSublistAccess(NamedMDNode *) {
+ return &Module::NamedMDList;
+ }
/// Get the symbol table of global variable and function identifiers
const ValueSymbolTable &getValueSymbolTable() const { return *ValSymTab; }
/// Get the Module's symbol table of global variable and function identifiers.
@@ -393,6 +432,31 @@
/// Determine if the list of aliases is empty.
bool alias_empty() const { return AliasList.empty(); }
+
+/// @}
+/// @name Named Metadata Iteration
+/// @{
+public:
+ /// Get an iterator to the first named metadata.
+ named_metadata_iterator named_metadata_begin()
+ { return NamedMDList.begin(); }
+ /// Get a constant iterator to the first named metadata.
+ const_named_metadata_iterator named_metadata_begin() const
+ { return NamedMDList.begin(); }
+ /// Get an iterator to the last named metadata.
+ named_metadata_iterator named_metadata_end ()
+ { return NamedMDList.end(); }
+ /// Get a constant iterator to the last named metadata.
+ const_named_metadata_iterator named_metadata_end () const
+ { return NamedMDList.end(); }
+ /// Determine how many NamedMDNodes are in the Module's list of named metadata.
+ size_t named_metadata_size () const
+ { return NamedMDList.size(); }
+ /// Determine if the list of named metadata is empty.
+ bool named_metadata_empty() const
+ { return NamedMDList.empty(); }
+
+
/// @}
/// @name Utility functions for printing and dumping Module objects
/// @{
Modified: llvm/trunk/include/llvm/ValueSymbolTable.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ValueSymbolTable.h?rev=77476&r1=77475&r2=77476&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ValueSymbolTable.h (original)
+++ llvm/trunk/include/llvm/ValueSymbolTable.h Wed Jul 29 12:16:17 2009
@@ -23,6 +23,7 @@
class SymbolTableListTraits;
class BasicBlock;
class Function;
+ class NamedMDNode;
class Module;
class StringRef;
@@ -38,6 +39,7 @@
friend class SymbolTableListTraits<Function, Module>;
friend class SymbolTableListTraits<GlobalVariable, Module>;
friend class SymbolTableListTraits<GlobalAlias, Module>;
+ friend class SymbolTableListTraits<NamedMDNode, Module>;
/// @name Types
/// @{
public:
Modified: llvm/trunk/lib/VMCore/Metadata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Metadata.cpp?rev=77476&r1=77475&r2=77476&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Metadata.cpp (original)
+++ llvm/trunk/lib/VMCore/Metadata.cpp Wed Jul 29 12:16:17 2009
@@ -13,6 +13,7 @@
#include "llvm/Metadata.h"
#include "llvm/Module.h"
+#include "SymbolTableListTraitsImpl.h"
using namespace llvm;
//===----------------------------------------------------------------------===//
@@ -36,9 +37,11 @@
MetadataBase*const* MDs, unsigned NumMDs,
Module *M)
: MetadataBase(Type::MetadataTy, Value::NamedMDNodeVal),
- Parent(M), Name(N, NameLength) {
+ Name(N, NameLength) {
+ setName(N);
for (unsigned i = 0; i != NumMDs; ++i)
Node.push_back(WeakMetadataVH(MDs[i]));
- // FIXME : Add into the parent module.
+ if (M)
+ M->getNamedMDList().push_back(this);
}
Modified: llvm/trunk/lib/VMCore/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Module.cpp?rev=77476&r1=77475&r2=77476&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Module.cpp (original)
+++ llvm/trunk/lib/VMCore/Module.cpp Wed Jul 29 12:16:17 2009
@@ -67,6 +67,7 @@
FunctionList.clear();
AliasList.clear();
LibraryList.clear();
+ NamedMDList.clear();
delete ValSymTab;
delete TypeSymTab;
}
@@ -288,6 +289,13 @@
return dyn_cast_or_null<GlobalAlias>(getNamedValue(Name));
}
+/// getNamedMetadata - Return the first named MDNode in the module with the
+/// specified name. This method returns null if a MDNode with the specified
+/// name is not found.
+NamedMDNode *Module::getNamedMetadata(const StringRef &Name) const {
+ return dyn_cast_or_null<NamedMDNode>(getNamedValue(Name));
+}
+
//===----------------------------------------------------------------------===//
// Methods for easy access to the types in the module.
//
Modified: llvm/trunk/lib/VMCore/Value.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Value.cpp?rev=77476&r1=77475&r2=77476&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Value.cpp (original)
+++ llvm/trunk/lib/VMCore/Value.cpp Wed Jul 29 12:16:17 2009
@@ -142,6 +142,10 @@
} else if (Argument *A = dyn_cast<Argument>(V)) {
if (Function *P = A->getParent())
ST = &P->getValueSymbolTable();
+ } else if (NamedMDNode *N = dyn_cast<NamedMDNode>(V)) {
+ if (Module *P = N->getParent()) {
+ ST = &P->getValueSymbolTable();
+ }
} else if (isa<MDString>(V))
return true;
else {
More information about the llvm-commits
mailing list