Update LLVM to 92395.

1 files changed, 38 insertions, 30 deletions

diff --git a/include/llvm/Module.h b/include/llvm/Module.h
index 04dfb35..9a8b53a 100644
--- a/include/llvm/Module.h
+++ b/include/llvm/Module.h
@@ -24,7 +24,6 @@
 
 namespace llvm {
 
-class GlobalValueRefMap;   // Used by ConstantVals.cpp
 class FunctionType;
 class LLVMContext;
 
@@ -132,7 +131,7 @@ public:
 /// @name Member Variables
 /// @{
 private:
-  LLVMContext& Context;          ///< The LLVMContext from which types and
+  LLVMContext &Context;          ///< The LLVMContext from which types and
                                  ///< constants are allocated.
   GlobalListType GlobalList;     ///< The Global Variables in the module
   FunctionListType FunctionList; ///< The Functions in the module
@@ -161,7 +160,7 @@ public:
 /// @}
 /// @name Module Level Accessors
 /// @{
-public:
+
   /// Get the module identifier which is, essentially, the name of the module.
   /// @returns the module identifier as a string
   const std::string &getModuleIdentifier() const { return ModuleID; }
@@ -185,16 +184,16 @@ public:
 
   /// Get the global data context.
   /// @returns LLVMContext - a container for LLVM's global information
-  LLVMContext& getContext() const { return Context; }
+  LLVMContext &getContext() const { return Context; }
 
   /// Get any module-scope inline assembly blocks.
   /// @returns a string containing the module-scope inline assembly blocks.
   const std::string &getModuleInlineAsm() const { return GlobalScopeAsm; }
+  
 /// @}
 /// @name Module Level Mutators
 /// @{
-public:
-
+  
   /// Set the module identifier.
   void setModuleIdentifier(StringRef ID) { ModuleID = ID; }
 
@@ -223,10 +222,19 @@ public:
   /// if a global with the specified name is not found.
   GlobalValue *getNamedValue(StringRef Name) const;
 
+  /// getMDKindID - Return a unique non-zero ID for the specified metadata kind.
+  /// This ID is uniqued across modules in the current LLVMContext.
+  unsigned getMDKindID(StringRef Name) const;
+  
+  /// getMDKindNames - Populate client supplied SmallVector with the name for
+  /// custom metadata IDs registered in this LLVMContext.   ID #0 is not used,
+  /// so it is filled in as an empty string.
+  void getMDKindNames(SmallVectorImpl<StringRef> &Result) const;
+  
 /// @}
 /// @name Function Accessors
 /// @{
-public:
+
   /// getOrInsertFunction - Look up the specified function in the module symbol
   /// table.  Four possibilities:
   ///   1. If it does not exist, add a prototype for the function and return it.
@@ -267,7 +275,7 @@ public:
 /// @}
 /// @name Global Variable Accessors
 /// @{
-public:
+
   /// getGlobalVariable - Look up the specified global variable in the module
   /// symbol table.  If it does not exist, return null. If AllowInternal is set
   /// to true, this function will return types that have InternalLinkage. By
@@ -294,7 +302,7 @@ public:
 /// @}
 /// @name Global Alias Accessors
 /// @{
-public:
+
   /// getNamedAlias - Return the first global alias in the module with the
   /// specified name, of arbitrary type.  This method returns null if a global
   /// with the specified name is not found.
@@ -303,7 +311,7 @@ public:
 /// @}
 /// @name Named Metadata Accessors
 /// @{
-public:
+  
   /// getNamedMetadata - Return the first NamedMDNode in the module with the
   /// specified name. This method returns null if a NamedMDNode with the 
   /// specified name is not found.
@@ -317,7 +325,7 @@ public:
 /// @}
 /// @name Type Accessors
 /// @{
-public:
+
   /// addTypeName - Insert an entry in the symbol table mapping Str to Type.  If
   /// there is already an entry for this name, true is returned and the symbol
   /// table is not modified.
@@ -334,7 +342,7 @@ public:
 /// @}
 /// @name Direct access to the globals list, functions list, and symbol table
 /// @{
-public:
+
   /// Get the Module's list of global variables (constant).
   const GlobalListType   &getGlobalList() const       { return GlobalList; }
   /// Get the Module's list of global variables.
@@ -375,7 +383,7 @@ public:
 /// @}
 /// @name Global Variable Iteration
 /// @{
-public:
+
   /// Get an iterator to the first global variable
   global_iterator       global_begin()       { return GlobalList.begin(); }
   /// Get a constant iterator to the first global variable
@@ -390,7 +398,7 @@ public:
 /// @}
 /// @name Function Iteration
 /// @{
-public:
+
   /// Get an iterator to the first function.
   iterator                begin()       { return FunctionList.begin(); }
   /// Get a constant iterator to the first function.
@@ -407,7 +415,7 @@ public:
 /// @}
 /// @name Dependent Library Iteration
 /// @{
-public:
+
   /// @brief Get a constant iterator to beginning of dependent library list.
   inline lib_iterator lib_begin() const { return LibraryList.begin(); }
   /// @brief Get a constant iterator to end of dependent library list.
@@ -424,7 +432,7 @@ public:
 /// @}
 /// @name Alias Iteration
 /// @{
-public:
+
   /// Get an iterator to the first alias.
   alias_iterator       alias_begin()            { return AliasList.begin(); }
   /// Get a constant iterator to the first alias.
@@ -442,31 +450,31 @@ public:
 /// @}
 /// @name Named Metadata Iteration
 /// @{
-public:
+
   /// Get an iterator to the first named metadata.
-  named_metadata_iterator       named_metadata_begin()            
-                                                { return NamedMDList.begin(); }
+  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(); }
+  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();   }
+  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();   }
+  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();  }
+  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(); }
+  bool named_metadata_empty() const { return NamedMDList.empty(); }
 
 
 /// @}
 /// @name Utility functions for printing and dumping Module objects
 /// @{
-public:
+
   /// Print the module to an output stream with AssemblyAnnotationWriter.
   void print(raw_ostream &OS, AssemblyAnnotationWriter *AAW) const;