Reapply r110396, with fixes to appease the Linux buildbot gods.

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

diff --git a/include/llvm/GlobalVariable.h b/include/llvm/GlobalVariable.h
index 428ce90fefcd933e4097f47e3fe2b89392c72329..633e8b4dc335af68b2d1188b50c68fb21ad007ee 100644 (file)
--- a/include/llvm/GlobalVariable.h
+++ b/include/llvm/GlobalVariable.h
@@ -23,6 +23,7 @@
 #include "llvm/GlobalValue.h"
 #include "llvm/OperandTraits.h"
 #include "llvm/ADT/ilist_node.h"
+#include "llvm/ADT/Twine.h"
 
 namespace llvm {
 
@@ -99,18 +100,10 @@ public:
     assert(hasInitializer() && "GV doesn't have initializer!");
     return static_cast<Constant*>(Op<0>().get());
   }
-  inline void setInitializer(Constant *CPV) {
-    if (CPV == 0) {
-      if (hasInitializer()) {
-        Op<0>().set(0);
-        NumOperands = 0;
-      }
-    } else {
-      if (!hasInitializer())
-        NumOperands = 1;
-      Op<0>().set(CPV);
-    }
-  }
+  /// setInitializer - Sets the initializer for this global variable, removing
+  /// any existing initializer if InitVal==NULL.  If this GV has type T*, the
+  /// initializer must have type T.
+  void setInitializer(Constant *InitVal);
 
   /// If the value is a global constant, its value is immutable throughout the
   /// runtime execution of the program.  Assigning a value into the constant