* Expose new command line arg --debug-pass for gccas and llc debugging

[oota-llvm.git] / lib / VMCore / Function.cpp

diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index 3d4a3547b0d7448bf4c53ac7457373982bcad8fc..e7d10c1496f26429d5199a51c64a04f8c99f52f4 100644 (file)
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -1,6 +1,7 @@
 //===-- Method.cpp - Implement the Method class ------------------*- C++ -*--=//
 //
-// This file implements the Method class for the VMCore library.
+// This file implements the Method & GlobalVariable classes for the VMCore
+// library.
 //
 //===----------------------------------------------------------------------===//
 
@@ -9,20 +10,25 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
 #include "llvm/Method.h"
+#include "llvm/GlobalVariable.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/iOther.h"
 
+//===----------------------------------------------------------------------===//
+// Method Implementation
+//===----------------------------------------------------------------------===//
+
+
 // Instantiate Templates - This ugliness is the price we have to pay
 // for having a ValueHolderImpl.h file seperate from ValueHolder.h!  :(
 //
 template class ValueHolder<MethodArgument, Method, Method>;
 template class ValueHolder<BasicBlock    , Method, Method>;
 
-Method::Method(const MethodType *Ty, const string &name) 
-  : Value(Ty, Value::MethodVal, name), SymTabValue(this), BasicBlocks(this), 
-    ArgumentList(this, this) {
-  assert(Ty->isMethodType() && "Method signature must be of method type!");
-  Parent = 0;
+Method::Method(const MethodType *Ty, bool isInternal, const std::string &name) 
+  : GlobalValue(PointerType::get(Ty), Value::MethodVal, isInternal, name),
+    SymTabValue(this), BasicBlocks(this), ArgumentList(this, this) {
+  assert(::isa<MethodType>(Ty) && "Method signature must be of method type!");
 }
 
 Method::~Method() {
@@ -39,8 +45,10 @@ Method::~Method() {
 }
 
 // Specialize setName to take care of symbol table majik
-void Method::setName(const string &name) {
+void Method::setName(const std::string &name, SymbolTable *ST) {
   Module *P;
+  assert((ST == 0 || (!getParent() || ST == getParent()->getSymbolTable())) &&
+        "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable()->remove(this);
   Value::setName(name);
   if (P && getName() != "") P->getSymbolTableSure()->insert(this);
@@ -53,12 +61,12 @@ void Method::setParent(Module *parent) {
   setParentSymTab(Parent ? Parent->getSymbolTableSure() : 0);
 }
 
-const Type *Method::getReturnType() const { 
-  return ((const MethodType *)getType())->getReturnType(); 
+const MethodType *Method::getMethodType() const {
+  return cast<MethodType>(cast<PointerType>(getType())->getElementType());
 }
 
-const MethodType *Method::getMethodType() const { 
-  return (const MethodType *)getType();
+const Type *Method::getReturnType() const { 
+  return getMethodType()->getReturnType();
 }
 
 // dropAllReferences() - This function causes all the subinstructions to "let
@@ -72,3 +80,25 @@ const MethodType *Method::getMethodType() const {
 void Method::dropAllReferences() {
   for_each(begin(), end(), std::mem_fun(&BasicBlock::dropAllReferences));
 }
+
+//===----------------------------------------------------------------------===//
+// GlobalVariable Implementation
+//===----------------------------------------------------------------------===//
+
+GlobalVariable::GlobalVariable(const Type *Ty, bool constant, bool isIntern,
+                              Constant *Initializer = 0,
+                              const std::string &Name = "")
+  : GlobalValue(PointerType::get(Ty), Value::GlobalVariableVal, isIntern, Name),
+    isConstantGlobal(constant) {
+  if (Initializer) Operands.push_back(Use((Value*)Initializer, this));
+}
+
+// Specialize setName to take care of symbol table majik
+void GlobalVariable::setName(const std::string &name, SymbolTable *ST) {
+  Module *P;
+  assert((ST == 0 || (!getParent() || ST == getParent()->getSymbolTable())) &&
+        "Invalid symtab argument!");
+  if ((P = getParent()) && hasName()) P->getSymbolTable()->remove(this);
+  Value::setName(name);
+  if (P && getName() != "") P->getSymbolTableSure()->insert(this);
+}