X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FFunction.cpp;h=591bd9009f34b8bdb2ed9793fc5e941df6502a15;hb=d122f4b648571867c0f8f72290b6c1a0aac02ebb;hp=9cea29cf227e1c98648adb230791e3a4152d0b1b;hpb=ac0ec4795753caa8d2b5b8186a05d700998688ae;p=oota-llvm.git

diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index 9cea29cf227..591bd9009f3 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -1,53 +1,78 @@
-//===-- Method.cpp - Implement the Method class ------------------*- C++ -*--=//
+//===-- Function.cpp - Implement the Global object classes -------*- C++ -*--=//
 //
-// This file implements the Method & GlobalVariable classes for the VMCore
+// This file implements the Function & GlobalVariable classes for the VMCore
 // library.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ValueHolderImpl.h"
+#include "llvm/Function.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
-#include "llvm/Method.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/iOther.h"
-#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/Argument.h"
+#include "SymbolTableListTraitsImpl.h"
+
+iplist<BasicBlock> &ilist_traits<BasicBlock>::getList(Function *F) {
+  return F->getBasicBlockList();
+}
+
+Argument *ilist_traits<Argument>::createNode() {
+  return new Argument(Type::IntTy);
+}
+
+iplist<Argument> &ilist_traits<Argument>::getList(Function *F) {
+  return F->getArgumentList();
+}
+
+// Explicit instantiations of SymbolTableListTraits since some of the methods
+// are not in the public header file...
+template SymbolTableListTraits<Argument, Function, Function>;
+template SymbolTableListTraits<BasicBlock, Function, Function>;
+
+//===----------------------------------------------------------------------===//
+// Argument Implementation
+//===----------------------------------------------------------------------===//
+
+// Specialize setName to take care of symbol table majik
+void Argument::setName(const std::string &name, SymbolTable *ST) {
+  Function *P;
+  assert((ST == 0 || (!getParent() || ST == getParent()->getSymbolTable())) &&
+	 "Invalid symtab argument!");
+  if ((P = getParent()) && hasName()) P->getSymbolTable()->remove(this);
+  Value::setName(name);
+  if (P && hasName()) P->getSymbolTable()->insert(this);
+}
 
 //===----------------------------------------------------------------------===//
-// Method Implementation
+// Function 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) 
-  : GlobalValue(PointerType::get(Ty), Value::MethodVal, name),
-    SymTabValue(this), BasicBlocks(this), ArgumentList(this, this),
-    machineCode(new MachineCodeForMethod(this)) {
-  assert(::isa<MethodType>(Ty) && "Method signature must be of method type!");
+Function::Function(const FunctionType *Ty, bool isInternal,
+                   const std::string &name)
+  : GlobalValue(PointerType::get(Ty), Value::FunctionVal, isInternal, name) {
+  BasicBlocks.setItemParent(this);
+  BasicBlocks.setParent(this);
+  ArgumentList.setItemParent(this);
+  ArgumentList.setParent(this);
+  ParentSymTab = SymTab = 0;
 }
 
-Method::~Method() {
+Function::~Function() {
   dropAllReferences();    // After this it is safe to delete instructions.
 
-  // TODO: Should remove from the end, not the beginning of vector!
-  iterator BI = begin();
-  while ((BI = begin()) != end())
-    delete BasicBlocks.remove(BI);
+  BasicBlocks.clear();    // Delete all basic blocks...
 
   // Delete all of the method arguments and unlink from symbol table...
-  ArgumentList.delete_all();
+  ArgumentList.clear();
   ArgumentList.setParent(0);
+  delete SymTab;
 }
 
 // Specialize setName to take care of symbol table majik
-void Method::setName(const string &name, SymbolTable *ST) {
+void Function::setName(const std::string &name, SymbolTable *ST) {
   Module *P;
   assert((ST == 0 || (!getParent() || ST == getParent()->getSymbolTable())) &&
 	 "Invalid symtab argument!");
@@ -56,21 +81,43 @@ void Method::setName(const string &name, SymbolTable *ST) {
   if (P && getName() != "") P->getSymbolTableSure()->insert(this);
 }
 
-void Method::setParent(Module *parent) {
+void Function::setParent(Module *parent) {
   Parent = parent;
 
   // Relink symbol tables together...
-  setParentSymTab(Parent ? Parent->getSymbolTableSure() : 0);
+  ParentSymTab = Parent ? Parent->getSymbolTableSure() : 0;
+  if (SymTab) SymTab->setParentSymTab(ParentSymTab);
 }
 
-const MethodType *Method::getMethodType() const {
-  return cast<MethodType>(cast<PointerType>(getType())->getValueType());
+const FunctionType *Function::getFunctionType() const {
+  return cast<FunctionType>(getType()->getElementType());
 }
 
-const Type *Method::getReturnType() const { 
-  return getMethodType()->getReturnType();
+const Type *Function::getReturnType() const { 
+  return getFunctionType()->getReturnType();
 }
 
+SymbolTable *Function::getSymbolTableSure() {
+  if (!SymTab) SymTab = new SymbolTable(ParentSymTab);
+  return SymTab;
+}
+
+// hasSymbolTable() - Returns true if there is a symbol table allocated to
+// this object AND if there is at least one name in it!
+//
+bool Function::hasSymbolTable() const {
+  if (!SymTab) return false;
+
+  for (SymbolTable::const_iterator I = SymTab->begin(); 
+       I != SymTab->end(); ++I) {
+    if (I->second.begin() != I->second.end())
+      return true;                                // Found nonempty type plane!
+  }
+  
+  return false;
+}
+
+
 // dropAllReferences() - This function causes all the subinstructions to "let
 // go" of all references that they are maintaining.  This allows one to
 // 'delete' a whole class at a time, even though there may be circular
@@ -79,24 +126,25 @@ const Type *Method::getReturnType() const {
 // valid on an object that has "dropped all references", except operator 
 // delete.
 //
-void Method::dropAllReferences() {
-  for_each(begin(), end(), std::mem_fun(&BasicBlock::dropAllReferences));
+void Function::dropAllReferences() {
+  for (iterator I = begin(), E = end(); I != E; ++I)
+    I->dropAllReferences();
 }
 
 //===----------------------------------------------------------------------===//
 // GlobalVariable Implementation
 //===----------------------------------------------------------------------===//
 
-GlobalVariable::GlobalVariable(const Type *Ty, bool isConstant,
-			       ConstPoolVal *Initializer = 0, 
-			       const string &Name = "")
-  : GlobalValue(PointerType::get(Ty), Value::GlobalVariableVal, Name),
-    Constant(isConstant) {
+GlobalVariable::GlobalVariable(const Type *Ty, bool constant, bool isIntern,
+			       Constant *Initializer,
+			       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 string &name, SymbolTable *ST) {
+void GlobalVariable::setName(const std::string &name, SymbolTable *ST) {
   Module *P;
   assert((ST == 0 || (!getParent() || ST == getParent()->getSymbolTable())) &&
 	 "Invalid symtab argument!");