From 6e153b366a10e59caf174e6e0f92df2ec3fa4382 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Tue, 2 Mar 2021 15:14:14 -0500 Subject: [PATCH] Fixes for LLVM 11 compat CallSite.h --- include/remill/BC/Compat/CallSite.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/remill/BC/Compat/CallSite.h b/include/remill/BC/Compat/CallSite.h index 50c2002a3..c820b4f75 100644 --- 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() {