[llvm-commits] [parallel] CVS: llvm/include/llvm/Argument.h Constant.h Module.h Pass.h Type.h

[Misha Brukman]

Changes in directory llvm/include/llvm:

Argument.h updated: 1.7 -> 1.7.4.1
Constant.h updated: 1.12 -> 1.12.4.1
Module.h updated: 1.40 -> 1.40.2.1
Pass.h updated: 1.42 -> 1.42.4.1
Type.h updated: 1.37.4.1 -> 1.37.4.2

---
Log message:

Merge from trunk.

---
Diffs of the changes:  (+10 -12)

Index: llvm/include/llvm/Argument.h
diff -u llvm/include/llvm/Argument.h:1.7 llvm/include/llvm/Argument.h:1.7.4.1
--- llvm/include/llvm/Argument.h:1.7	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/Argument.h	Wed Mar 10 19:20:50 2004
@@ -19,6 +19,10 @@
 
 namespace llvm {
 
+template<typename SC> struct ilist_traits;
+template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
+         typename SubClass> class SymbolTableListTraits;
+
 class Argument : public Value {  // Defined in the Function.cpp file
   Function *Parent;
 


Index: llvm/include/llvm/Constant.h
diff -u llvm/include/llvm/Constant.h:1.12 llvm/include/llvm/Constant.h:1.12.4.1
--- llvm/include/llvm/Constant.h:1.12	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/Constant.h	Wed Mar 10 19:20:50 2004
@@ -85,12 +85,6 @@
            "implemented for all constants that have operands!");
     assert(0 && "Constants that do not have operands cannot be using 'From'!");
   }
-
-  // WARNING: Only to be used by Bytecode & Assembly Parsers!  USER CODE SHOULD
-  // NOT USE THIS!!
-  // Returns the number of uses of OldV that were replaced.
-  unsigned mutateReferences(Value* OldV, Value *NewV);
-  // END WARNING!!
 };
 
 } // End llvm namespace


Index: llvm/include/llvm/Module.h
diff -u llvm/include/llvm/Module.h:1.40 llvm/include/llvm/Module.h:1.40.2.1
--- llvm/include/llvm/Module.h:1.40	Wed Dec 31 02:42:27 2003
+++ llvm/include/llvm/Module.h	Wed Mar 10 19:20:50 2004
@@ -77,7 +77,6 @@
   // Accessor for the underlying GVRefMap... only through the Constant class...
   friend class Constant;
   friend class ConstantPointerRef;
-  void mutateConstantPointerRef(GlobalValue *OldGV, GlobalValue *NewGV);
   ConstantPointerRef *getConstantPointerRef(GlobalValue *GV);
   void destroyConstantPointerRef(ConstantPointerRef *CPR);
 


Index: llvm/include/llvm/Pass.h
diff -u llvm/include/llvm/Pass.h:1.42 llvm/include/llvm/Pass.h:1.42.4.1
--- llvm/include/llvm/Pass.h:1.42	Tue Nov 11 16:41:30 2003
+++ llvm/include/llvm/Pass.h	Wed Mar 10 19:20:50 2004
@@ -29,11 +29,12 @@
 #ifndef LLVM_PASS_H
 #define LLVM_PASS_H
 
-#include <vector>
-#include <map>
+#include <cassert>
 #include <iosfwd>
+#include <map>
+#include <set>
 #include <typeinfo>
-#include <cassert>
+#include <vector>
 
 namespace llvm {
 


Index: llvm/include/llvm/Type.h
diff -u llvm/include/llvm/Type.h:1.37.4.1 llvm/include/llvm/Type.h:1.37.4.2
--- llvm/include/llvm/Type.h:1.37.4.1	Mon Mar  1 17:57:19 2004
+++ llvm/include/llvm/Type.h	Wed Mar 10 19:20:50 2004
@@ -206,8 +206,8 @@
            ID != FunctionTyID && ID != LabelTyID && ID != OpaqueTyID;
   }
 
-  /// getPrimitiveSize - Return the basic size of this type if it is a primative
-  /// type.  These are fixed by LLVM and are not target dependent.  This will
+  /// getPrimitiveSize - Return the basic size of this type if it is a primitive
+  /// type.  These are fixed by LLVM and are not target-dependent.  This will
   /// return zero if the type does not have a size or is not a primitive type.
   ///
   unsigned getPrimitiveSize() const;