For PR351:

[oota-llvm.git] / include / llvm / Module.h

diff --git a/include/llvm/Module.h b/include/llvm/Module.h
index 64a84d4db10f0357c9419e0279ce0695ad1fb9bf..846b47f057606d337b461e6810dc25bd50ed1f40 100644 (file)
--- a/include/llvm/Module.h
+++ b/include/llvm/Module.h
@@ -27,7 +27,6 @@ namespace llvm {
 
 class GlobalVariable;
 class GlobalValueRefMap;   // Used by ConstantVals.cpp
-class ConstantPointerRef;
 class FunctionType;
 class SymbolTable;
 
@@ -49,7 +48,6 @@ public:
   typedef iplist<GlobalVariable> GlobalListType;
   typedef iplist<Function> FunctionListType;
   typedef SetVector<std::string> LibraryListType;
-  typedef std::vector<std::string> PassListType;
 
   // Global Variable iterators...
   typedef GlobalListType::iterator                             giterator;
@@ -66,9 +64,6 @@ public:
   // Library list iterators
   typedef LibraryListType::const_iterator lib_iterator;
 
-  // Link-time Pass list iterators
-  typedef PassListType::const_iterator pass_iterator;
-
   enum Endianness  { AnyEndianness, LittleEndian, BigEndian };
   enum PointerSize { AnyPointerSize, Pointer32, Pointer64 };
 
@@ -76,7 +71,6 @@ private:
   GlobalListType GlobalList;     // The Global Variables in the module
   FunctionListType FunctionList; // The Functions in the module
   LibraryListType LibraryList;   // The Libraries needed by the module
-  PassListType PassList;         // The Passes needed by the module at link time
   SymbolTable *SymTab;           // Symbol Table for the module
   std::string ModuleID;          // Human readable identifier for the module
   std::string TargetTriple;      // Platform target triple Module compiled on
@@ -86,11 +80,7 @@ private:
   Endianness  Endian;     // True if target is little endian
   PointerSize PtrSize;    // True if target has 32-bit pointers (false = 64-bit)
 
-  // Accessor for the underlying GVRefMap... only through the Constant class...
   friend class Constant;
-  friend class ConstantPointerRef;
-  ConstantPointerRef *getConstantPointerRef(GlobalValue *GV);
-  void destroyConstantPointerRef(ConstantPointerRef *CPR);
 
 public:
   Module(const std::string &ModuleID);
@@ -147,7 +137,7 @@ public:
   /// getGlobalVariable - Look up the specified global variable in the module
   /// symbol table.  If it does not exist, return null.  Note that this only
   /// returns a global variable if it does not have internal linkage.  The type
-  /// argument should be the underlying type of the global, ie, it should not
+  /// argument should be the underlying type of the global, i.e., it should not
   /// have the top-level PointerType, which represents the address of the
   /// global.
   ///
@@ -206,7 +196,7 @@ public:
   inline reverse_giterator       grend  ()       { return GlobalList.rend();   }
   inline const_reverse_giterator grend  () const { return GlobalList.rend();   }
 
-  inline unsigned                  gsize() const { return GlobalList.size(); }
+  inline size_t                    gsize() const { return GlobalList.size(); }
   inline bool                     gempty() const { return GlobalList.empty(); }
   inline const GlobalVariable    &gfront() const { return GlobalList.front(); }
   inline       GlobalVariable    &gfront()       { return GlobalList.front(); }
@@ -224,7 +214,7 @@ public:
   inline reverse_iterator       rend  ()       { return FunctionList.rend();   }
   inline const_reverse_iterator rend  () const { return FunctionList.rend();   }
 
-  inline unsigned                 size() const { return FunctionList.size(); }
+  inline size_t                   size() const { return FunctionList.size(); }
   inline bool                    empty() const { return FunctionList.empty(); }
   inline const Function         &front() const { return FunctionList.front(); }
   inline       Function         &front()       { return FunctionList.front(); }
@@ -241,7 +231,7 @@ public:
   inline lib_iterator lib_end() const { return LibraryList.end(); }
 
   /// @brief Returns the number of items in the list of libraries.
-  inline unsigned lib_size() const { return LibraryList.size(); }
+  inline size_t lib_size() const { return LibraryList.size(); }
 
   /// @brief Add a library to the list of dependent libraries
   inline void addLibrary(const std::string& Lib){ LibraryList.insert(Lib); }
@@ -252,27 +242,6 @@ public:
   /// @brief Get all the libraries 
   inline const LibraryListType& getLibraries() const { return LibraryList; }
 
-  //===--------------------------------------------------------------------===//
-  // Access functions for Link-time pass list
-
-  /// @brief Get a constant iterator to beginning of pass list.
-  inline pass_iterator pass_begin() const { return PassList.begin(); }
-
-  /// @brief Get a constant iterator to end of pass list.
-  inline pass_iterator pass_end() const { return PassList.end(); }
-
-  /// @brief Returns the number of items in the list of passes.
-  inline unsigned pass_size() const { return PassList.size(); }
-
-  /// @brief Add a library to the list of passes
-  inline void addPass(const std::string& Pass){ PassList.push_back(Pass); }
-
-  /// @brief Remove a library from the list of passes
-  void removePass(const std::string& Lib); 
-
-  /// @brief Get all the passes 
-  inline const PassListType& getPasses() const { return PassList; }
-
   //===--------------------------------------------------------------------===//
   // Utility functions for printing and dumping Module objects