[llvm-commits] CVS: llvm-poolalloc/lib/PoolAllocate/AccessTrace.cpp Heuristic.cpp PointerCompress.cpp PoolAllocate.cpp TransformFunctionBody.cpp

[John Criswell]

Changes in directory llvm-poolalloc/lib/PoolAllocate:

AccessTrace.cpp updated: 1.7 -> 1.8
Heuristic.cpp updated: 1.15 -> 1.16
PointerCompress.cpp updated: 1.73 -> 1.74
PoolAllocate.cpp updated: 1.128 -> 1.129
TransformFunctionBody.cpp updated: 1.58 -> 1.59
---
Log message:

Merged from release_19 branch.
This adds correct compilation of DSA, pool inference, and configure script
fixes to mainline.



---
Diffs of the changes:  (+16 -11)

 AccessTrace.cpp           |    5 +++--
 Heuristic.cpp             |    3 ++-
 PointerCompress.cpp       |    5 +++--
 PoolAllocate.cpp          |    7 ++++---
 TransformFunctionBody.cpp |    7 ++++---
 5 files changed, 16 insertions(+), 11 deletions(-)


Index: llvm-poolalloc/lib/PoolAllocate/AccessTrace.cpp
diff -u llvm-poolalloc/lib/PoolAllocate/AccessTrace.cpp:1.7 llvm-poolalloc/lib/PoolAllocate/AccessTrace.cpp:1.8
--- llvm-poolalloc/lib/PoolAllocate/AccessTrace.cpp:1.7	Wed Dec 13 14:06:42 2006
+++ llvm-poolalloc/lib/PoolAllocate/AccessTrace.cpp	Wed Dec 13 23:51:06 2006
@@ -12,9 +12,10 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "pointercompress"
+
+#include "dsa/DataStructure.h"
+#include "dsa/DSGraph.h"
 #include "poolalloc/PoolAllocate.h"
-#include "llvm/Analysis/DataStructure/DataStructure.h"
-#include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
 using namespace llvm;


Index: llvm-poolalloc/lib/PoolAllocate/Heuristic.cpp
diff -u llvm-poolalloc/lib/PoolAllocate/Heuristic.cpp:1.15 llvm-poolalloc/lib/PoolAllocate/Heuristic.cpp:1.16
--- llvm-poolalloc/lib/PoolAllocate/Heuristic.cpp:1.15	Wed Jul 26 10:07:40 2006
+++ llvm-poolalloc/lib/PoolAllocate/Heuristic.cpp	Wed Dec 13 23:51:07 2006
@@ -12,10 +12,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "Heuristic.h"
+
+#include "dsa/DSGraphTraits.h"
 #include "poolalloc/PoolAllocate.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
-#include "llvm/Analysis/DataStructure/DSGraphTraits.h"
 #include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Target/TargetData.h"


Index: llvm-poolalloc/lib/PoolAllocate/PointerCompress.cpp
diff -u llvm-poolalloc/lib/PoolAllocate/PointerCompress.cpp:1.73 llvm-poolalloc/lib/PoolAllocate/PointerCompress.cpp:1.74
--- llvm-poolalloc/lib/PoolAllocate/PointerCompress.cpp:1.73	Wed Dec 13 14:06:42 2006
+++ llvm-poolalloc/lib/PoolAllocate/PointerCompress.cpp	Wed Dec 13 23:51:07 2006
@@ -12,13 +12,14 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "pointercompress"
+
+#include "dsa/DataStructure.h"
+#include "dsa/DSGraph.h"
 #include "poolalloc/PoolAllocate.h"
 #include "Heuristic.h"
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
-#include "llvm/Analysis/DataStructure/DataStructure.h"
-#include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/CommandLine.h"


Index: llvm-poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u llvm-poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.128 llvm-poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.129
--- llvm-poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.128	Wed Dec 13 14:06:42 2006
+++ llvm-poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Wed Dec 13 23:51:07 2006
@@ -13,6 +13,10 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "poolalloc"
+
+#include "dsa/DataStructure.h"
+#include "dsa/DSGraph.h"
+#include "dsa/CallTargets.h"
 #include "poolalloc/PoolAllocate.h"
 #include "Heuristic.h"
 #include "llvm/Constants.h"
@@ -20,13 +24,10 @@
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Constants.h"
-#include "llvm/Analysis/DataStructure/DataStructure.h"
-#include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Transforms/Utils/Cloning.h"
-#include "llvm/Analysis/DataStructure/CallTargets.h"
 #include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/STLExtras.h"


Index: llvm-poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp
diff -u llvm-poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.58 llvm-poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.59
--- llvm-poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.58	Wed Dec 13 14:06:42 2006
+++ llvm-poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp	Wed Dec 13 23:51:07 2006
@@ -12,10 +12,11 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "PoolAllocator"
+
+#include "dsa/DataStructure.h"
+#include "dsa/DSGraph.h"
+#include "dsa/CallTargets.h"
 #include "poolalloc/PoolAllocate.h"
-#include "llvm/Analysis/DataStructure/DataStructure.h"
-#include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "llvm/Analysis/DataStructure/CallTargets.h"
 #include "llvm/Module.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constants.h"