bin2llvmir/decoderL fix #335.

avast · Jun 20, 2018 · 1a0bff2 · 1a0bff2
1 parent 1da7146
commit 1a0bff2
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/bin2llvmir/optimizations/decoder/decoder.cpp b/src/bin2llvmir/optimizations/decoder/decoder.cpp
@@ -1421,13 +1421,7 @@ void Decoder::handleDelaySlotLikely(
 	assert(_c2l->getDelaySlot(res.capstoneInsn->id));
 	assert(_c2l->getDelaySlot(res.capstoneInsn->id) == 1);
 
-	assert(isa<BranchInst>(res.branchCall->getNextNode()));
-	assert(cast<BranchInst>(res.branchCall->getNextNode())->isConditional());
-
-	// TODO: This assumes that the pseudo cond branch was solved and cond
-	// branch created, but we should handle likely ds even if it was not.
-	//
-	auto* br = cast<BranchInst>(res.branchCall->getNextNode());
+	auto* br = dyn_cast<BranchInst>(res.branchCall->getNextNode());
 	if (br && br->isConditional())
 	{
 		auto* nextBb = br->getParent()->getNextNode();
@@ -1455,6 +1449,11 @@ void Decoder::handleDelaySlotLikely(
 
 		_likelyBb2Target.emplace(newBb, target);
 	}
+	else
+	{
+		// TODO: This assumes that the pseudo cond branch was solved and cond
+		// branch created, but we should handle likely ds even if it was not.
+	}
 }
 
 void Decoder::resolvePseudoCalls()