From 211c714dede4960774fb8b20a75289e5aa4bae79 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Sun, 12 Feb 2012 22:54:14 +0000
Subject: Update for LLVM changes - there is no more "unwind" instruction.

Patch by arrowdodger!

git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@150354 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Core/Executor.cpp     | 2 ++
 lib/Core/StatsTracker.cpp | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 08cf3f74..e13cebb9 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -1427,6 +1427,7 @@ void Executor::executeInstruction(ExecutionState &state, KInstruction *ki) {
     }      
     break;
   }
+#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1)
   case Instruction::Unwind: {
     for (;;) {
       KInstruction *kcaller = state.stack.back().caller;
@@ -1448,6 +1449,7 @@ void Executor::executeInstruction(ExecutionState &state, KInstruction *ki) {
     }
     break;
   }
+#endif
   case Instruction::Br: {
     BranchInst *bi = cast<BranchInst>(i);
     if (bi->isUnconditional()) {
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index f3eca268..e2fa0d35 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -669,7 +669,11 @@ void StatsTracker::computeReachableUncovered() {
           unsigned id = infos.getInfo(it).id;
           sm.setIndexedValue(stats::minDistToReturn, 
                              id, 
-                             isa<ReturnInst>(it) || isa<UnwindInst>(it));
+                             isa<ReturnInst>(it)
+#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1)
+                             || isa<UnwindInst>(it)
+#endif
+                             );
         }
       }
     }
-- 
cgit 1.4.1