Hold the LLVMContext by reference rather than by pointer.

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

diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index 9f4f23be08846d38f5de40a734591b8e8c7be800..228ef9440e09d91ad30df381f3913ce10b589b20 100644 (file)
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -35,28 +35,34 @@ template<> struct ilist_traits<BasicBlock>
   // createSentinel is used to get hold of the node that marks the end of the
   // list... (same trick used here as in ilist_traits<Instruction>)
   BasicBlock *createSentinel() const {
-    return const_cast<BasicBlock*>(static_cast<const BasicBlock*>(&Sentinel));
+    return static_cast<BasicBlock*>(&Sentinel);
   }
   static void destroySentinel(BasicBlock*) {}
-  static iplist<BasicBlock> &getList(Function *F);
+
+  BasicBlock *provideInitialHead() const { return createSentinel(); }
+  BasicBlock *ensureHead(BasicBlock*) const { return createSentinel(); }
+  static void noteHead(BasicBlock*, BasicBlock*) {}
+
   static ValueSymbolTable *getSymTab(Function *ItemParent);
-  static int getListOffset();
 private:
-  ilist_node<BasicBlock> Sentinel;
+  mutable ilist_node<BasicBlock> Sentinel;
 };
 
 template<> struct ilist_traits<Argument>
   : public SymbolTableListTraits<Argument, Function> {
 
   Argument *createSentinel() const {
-    return const_cast<Argument*>(static_cast<const Argument*>(&Sentinel));
+    return static_cast<Argument*>(&Sentinel);
   }
   static void destroySentinel(Argument*) {}
-  static iplist<Argument> &getList(Function *F);
+
+  Argument *provideInitialHead() const { return createSentinel(); }
+  Argument *ensureHead(Argument*) const { return createSentinel(); }
+  static void noteHead(Argument*, Argument*) {}
+
   static ValueSymbolTable *getSymTab(Function *ItemParent);
-  static int getListOffset();
 private:
-  ilist_node<Argument> Sentinel;
+  mutable ilist_node<Argument> Sentinel;
 };
 
 class Function : public GlobalValue, public Annotable,
@@ -295,9 +301,15 @@ public:
     CheckLazyArguments();
     return ArgumentList;
   }
+  static iplist<Argument> Function::*getSublistAccess(Argument*) {
+    return &Function::ArgumentList;
+  }
 
   const BasicBlockListType &getBasicBlockList() const { return BasicBlocks; }
         BasicBlockListType &getBasicBlockList()       { return BasicBlocks; }
+  static iplist<BasicBlock> Function::*getSublistAccess(BasicBlock*) {
+    return &Function::BasicBlocks;
+  }
 
   const BasicBlock       &getEntryBlock() const   { return front(); }
         BasicBlock       &getEntryBlock()         { return front(); }
@@ -383,15 +395,10 @@ public:
   /// including any contained basic blocks.
   ///
   void dropAllReferences();
-  
-  static unsigned getBasicBlockListOffset() {
-    Function *Obj = 0;
-    return unsigned(reinterpret_cast<uintptr_t>(&Obj->BasicBlocks));
-  }
-  static unsigned getArgumentListOffset() {
-    Function *Obj = 0;
-    return unsigned(reinterpret_cast<uintptr_t>(&Obj->ArgumentList));
-  }
+
+  /// hasAddressTaken - returns true if there are any uses of this function
+  /// other than direct calls or invokes to it.
+  bool hasAddressTaken() const;
 };
 
 inline ValueSymbolTable *
@@ -404,17 +411,6 @@ ilist_traits<Argument>::getSymTab(Function *F) {
   return F ? &F->getValueSymbolTable() : 0;
 }
 
-inline int 
-ilist_traits<BasicBlock>::getListOffset() {
-  return Function::getBasicBlockListOffset();
-}
-
-inline int 
-ilist_traits<Argument>::getListOffset() {
-  return Function::getArgumentListOffset();
-}
-
-
 } // End llvm namespace
 
 #endif