Have getDirectCallTarget use CallSite

git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@110351 91177308-0d34-0410-b5e6-96231b3b80d8
august782 · Aug 5, 2010 · 535a4ef · 535a4ef
1 parent 1d98ac4
commit 535a4ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/klee/Internal/Support/ModuleUtil.h b/include/klee/Internal/Support/ModuleUtil.h
@@ -16,6 +16,7 @@ namespace llvm {
  class Function;
  class Instruction;
  class Module; 
+ class CallSite; 
 }
 
 namespace klee {
@@ -28,7 +29,7 @@ namespace klee {
  /// null if it cannot be determined (should be only for indirect
  /// calls, although complicated constant expressions might be
  /// another possibility).
- llvm::Function *getDirectCallTarget(const llvm::Instruction*);
+ llvm::Function *getDirectCallTarget(llvm::CallSite);
 
  /// Return true iff the given Function value is used in something
  /// other than a direct call (or a constant expression that

diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
@@ -615,7 +615,7 @@ void StatsTracker::computeReachableUncovered() {
  // (which should be correct anyhow).
  callTargets.insert(std::make_pair(it,
  std::vector<Function*>()));
- } else if (Function *target = getDirectCallTarget(it)) {
+ } else if (Function *target = getDirectCallTarget(cs)) {
  callTargets[it].push_back(target);
  } else {
  callTargets[it] = 

diff --git a/lib/Module/ModuleUtil.cpp b/lib/Module/ModuleUtil.cpp
@@ -17,6 +17,7 @@
 #include "llvm/Module.h"
 #include "llvm/Assembly/AsmAnnotationWriter.h"
 #include "llvm/Support/CFG.h"
+#include "llvm/Support/CallSite.h"
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Analysis/ValueTracking.h"
@@ -45,10 +46,8 @@ Module *klee::linkWithLibrary(Module *module,
  return linker.releaseModule();
 }
 
-Function *klee::getDirectCallTarget(const Instruction *i) {
- assert(isa<CallInst>(i) || isa<InvokeInst>(i));
-
- Value *v = i->getOperand(0);
+Function *klee::getDirectCallTarget(CallSite cs) {
+ Value *v = cs.getCalledValue();
  if (Function *f = dyn_cast<Function>(v)) {
  return f;
  } else if (llvm::ConstantExpr *ce = dyn_cast<llvm::ConstantExpr>(v)) {