Fixes for LLVM 11 compat CallSite.h (#495)

lifting-bits · Mar 2, 2021 · 3d71960 · 3d71960
1 parent 6fc78e6
commit 3d71960
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/include/remill/BC/Compat/CallSite.h b/include/remill/BC/Compat/CallSite.h
@@ -64,17 +64,17 @@ struct CallSite {
   ::llvm::CallBase *cb;
 
   CallSite(::llvm::Instruction *inst)
-      : cb(::llvm::dyn_cast<::llvm::CallBase>(inst)) {}
+      : cb(::llvm::dyn_cast_or_null<::llvm::CallBase>(inst)) {}
 
   CallSite(::llvm::User *user)
-      : CallSite(::llvm::dyn_cast<::llvm::Instruction>(user)) {}
+      : CallSite(::llvm::dyn_cast_or_null<::llvm::Instruction>(user)) {}
 
   bool isInvoke() const {
-    return ::llvm::isa<::llvm::InvokeInst>(cb);
+    return cb && ::llvm::isa<::llvm::InvokeInst>(*cb);
   }
 
   bool isCall() const {
-    return ::llvm::isa<::llvm::CallInst>(cb);
+    return cb && ::llvm::isa<::llvm::CallInst>(*cb);
   }
 
   ::llvm::Value *getCalledValue() {