[llvm-commits] [poolalloc] r50184 - in /poolalloc/trunk: include/poolalloc/PoolAllocate.h lib/DSA/Local.cpp

[John Criswell]

Author: criswell
Date: Wed Apr 23 16:16:51 2008
New Revision: 50184

URL: http://llvm.org/viewvc/llvm-project?rev=50184&view=rev
Log:
Fixed inconsistent types.
Removed inclusion of SAFECode header files.

Modified:
    poolalloc/trunk/include/poolalloc/PoolAllocate.h
    poolalloc/trunk/lib/DSA/Local.cpp

Modified: poolalloc/trunk/include/poolalloc/PoolAllocate.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc/PoolAllocate.h?rev=50184&r1=50183&r2=50184&view=diff

==============================================================================
--- poolalloc/trunk/include/poolalloc/PoolAllocate.h (original)
+++ poolalloc/trunk/include/poolalloc/PoolAllocate.h Wed Apr 23 16:16:51 2008
@@ -23,19 +23,13 @@
 #include "llvm/ADT/EquivalenceClasses.h"
 #include "llvm/ADT/VectorExtras.h"
 #include "llvm/ADT/hash_set"
+#include "dsa/DataStructure.h"
 #include "poolalloc/Config/config.h"
 
-#ifdef SAFECODE
-#include "ConvertUnsafeAllocas.h"
-#endif
-
-
 #include <set>
+#include <utility>
 
 namespace llvm {
-#ifdef SAFECODE
-  using namespace CUA;
-#endif  
 class DSNode;
 class DSGraph;
 class Type;
@@ -136,8 +130,8 @@
 
   virtual Value * getGlobalPool (const DSNode * Node) {return 0;}
 
-  virtual CompleteBUDataStructures::callee_iterator callee_begin (CallInst *CI) { return ECGraphs->callee_begin(CI);}
-  virtual CompleteBUDataStructures::callee_iterator callee_end   (CallInst *CI) { return ECGraphs->callee_end(CI);}
+  virtual CompleteBUDataStructures::callee_iterator callee_begin (Instruction *I) { return ECGraphs->callee_begin(I);}
+  virtual CompleteBUDataStructures::callee_iterator callee_end   (Instruction *I) { return ECGraphs->callee_end(I);}
 };
 
 /// PoolAllocate - The main pool allocation pass
@@ -155,9 +149,6 @@
   std::map<Function*, Function*> CloneToOrigMap;
 public:
 
-#ifdef SAFECODE  
-  ConvertUnsafeAllocas *CUAPass;
-#endif  
   Constant *PoolInit, *PoolDestroy, *PoolAlloc, *PoolRealloc, *PoolMemAlign;
   Constant *PoolFree;
   Constant *PoolCalloc;
@@ -273,13 +264,13 @@
   }
 
   virtual CompleteBUDataStructures::callee_iterator
-  callee_begin (CallInst * CI) {
-    return ECGraphs->callee_begin(CI);
+  callee_begin (Instruction * I) {
+    return ECGraphs->callee_begin(I);
   }
 
   virtual CompleteBUDataStructures::callee_iterator
-  callee_end (CallInst * CI) {
-    return ECGraphs->callee_end(CI);
+  callee_end (Instruction * I) {
+    return ECGraphs->callee_end(I);
   }
 
 protected:
@@ -371,7 +362,7 @@
 /// it doesn't involve all of complex machinery of the original pool allocation
 /// implementation.
 class PoolAllocateSimple : public PoolAllocate {
-  GlobalValue* TheGlobalPool;
+  Value * TheGlobalPool;
 public:
   static char ID;
   PoolAllocateSimple() : PoolAllocate(false, (intptr_t)&ID) {}

Modified: poolalloc/trunk/lib/DSA/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=50184&r1=50183&r2=50184&view=diff

==============================================================================
--- poolalloc/trunk/lib/DSA/Local.cpp (original)
+++ poolalloc/trunk/lib/DSA/Local.cpp Wed Apr 23 16:16:51 2008
@@ -580,7 +580,7 @@
 
   case Intrinsic::eh_exception: {
     DSNode * Node = createNode();
-    Node->setIncompleteMarker();
+    //Node->setIncompleteMarker();
     Node->foldNodeCompletely();
     setDestTo (*(CS.getInstruction()), Node);
     return true;