Make Escape Analysis work for any pointer.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57412 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Analysis/EscapeAnalysis.h b/include/llvm/Analysis/EscapeAnalysis.h
index 0befb31..03012a8 100644
--- a/include/llvm/Analysis/EscapeAnalysis.h
+++ b/include/llvm/Analysis/EscapeAnalysis.h
@@ -50,8 +50,9 @@
//===---------------------------------------------------------------------
// 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 69dde4d..43bad29 100644
--- a/lib/Analysis/EscapeAnalysis.cpp
+++ b/lib/Analysis/EscapeAnalysis.cpp
@@ -98,18 +98,22 @@
/// 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