2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Module/Checks.cpp b/lib/Module/Checks.cpp
index 9286c491..10481f14 100644
--- a/lib/Module/Checks.cpp
+++ b/lib/Module/Checks.cpp
@@ -73,7 +73,7 @@ bool DivCheckPass::runOnModule(Module &M) {
   KleeIRMetaData md(ctx);
   auto divZeroCheckFunction = cast<Function>(
       M.getOrInsertFunction("klee_div_zero_check", Type::getVoidTy(ctx),
-                            Type::getInt64Ty(ctx), NULL));
+                            Type::getInt64Ty(ctx) KLEE_LLVM_GOIF_TERMINATOR));
 
   for (auto &divInst : divInstruction) {
     llvm::IRBuilder<> Builder(divInst /* Inserts before divInst*/);
@@ -132,7 +132,7 @@ bool OvershiftCheckPass::runOnModule(Module &M) {
   KleeIRMetaData md(ctx);
   auto overshiftCheckFunction = cast<Function>(M.getOrInsertFunction(
       "klee_overshift_check", Type::getVoidTy(ctx), Type::getInt64Ty(ctx),
-      Type::getInt64Ty(ctx), NULL));
+      Type::getInt64Ty(ctx) KLEE_LLVM_GOIF_TERMINATOR));
 
   for (auto &shiftInst : shiftInstructions) {
     llvm::IRBuilder<> Builder(shiftInst);
diff --git a/lib/Module/IntrinsicCleaner.cpp b/lib/Module/IntrinsicCleaner.cpp
index c48952c2..ab16a265 100644
--- a/lib/Module/IntrinsicCleaner.cpp
+++ b/lib/Module/IntrinsicCleaner.cpp
@@ -210,7 +210,8 @@ bool IntrinsicCleanerPass::runOnBasicBlock(BasicBlock &b, Module &M) {
         // Intrinsic instruction "llvm.trap" found. Directly lower it to
         // a call of the abort() function.
         Function *F = cast<Function>(
-            M.getOrInsertFunction("abort", Type::getVoidTy(ctx), NULL));
+            M.getOrInsertFunction("abort", Type::getVoidTy(ctx)
+		    KLEE_LLVM_GOIF_TERMINATOR));
         F->setDoesNotReturn();
         F->setDoesNotThrow();