From 4b089929b4cfa4b3ca7ad6a79db5c60b73012755 Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Sun, 12 Oct 2008 07:33:29 +0000
Subject: [PATCH] Make Escape Analysis work for any pointer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57412 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Analysis/EscapeAnalysis.h |  5 +++--
 lib/Analysis/EscapeAnalysis.cpp        | 16 ++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/llvm/Analysis/EscapeAnalysis.h b/include/llvm/Analysis/EscapeAnalysis.h
index 0befb31f4e7..03012a828cb 100644
--- a/include/llvm/Analysis/EscapeAnalysis.h
+++ b/include/llvm/Analysis/EscapeAnalysis.h
@@ -50,8 +50,9 @@ public:
   //===---------------------------------------------------------------------
   // Client API
 
-  /// escapes - returns true if the AllocationInst can escape.
-  bool escapes(AllocationInst* A);
+  /// escapes - returns true if the value, which must have a pointer type,
+  /// can escape.
+  bool escapes(Value* A);
 };
 
 } // end llvm namespace
diff --git a/lib/Analysis/EscapeAnalysis.cpp b/lib/Analysis/EscapeAnalysis.cpp
index 69dde4d7fdf..43bad29fb7d 100644
--- a/lib/Analysis/EscapeAnalysis.cpp
+++ b/lib/Analysis/EscapeAnalysis.cpp
@@ -98,18 +98,22 @@ bool EscapeAnalysis::runOnFunction(Function& F) {
 /// escape point.
 /// FIXME: Once we've discovered a path, it would be a good idea to memoize it,
 /// and all of its subpaths, to amortize the cost of future queries.
-bool EscapeAnalysis::escapes(AllocationInst* A) {
-  std::vector<Instruction*> worklist;
+bool EscapeAnalysis::escapes(Value* A) {
+  assert(isa<PointerType>(A->getType()) && 
+         "Can't do escape analysis on non-pointer types!");
+  
+  std::vector<Value*> worklist;
   worklist.push_back(A);
   
-  SmallPtrSet<Instruction*, 8> visited;
+  SmallPtrSet<Value*, 8> visited;
   visited.insert(A);
   while (!worklist.empty()) {
-    Instruction* curr = worklist.back();
+    Value* curr = worklist.back();
     worklist.pop_back();
     
-    if (EscapePoints.count(curr))
-      return true;
+    if (Instruction* I = dyn_cast<Instruction>(curr))
+      if (EscapePoints.count(I))
+        return true;
     
     if (StoreInst* S = dyn_cast<StoreInst>(curr)) {
       // We know this must be an instruction, because constant gep's would