Merging dev to master for linux demo fix -- will not change personal or

commercial builds

1 files changed, 8 insertions, 1 deletions

diff --git a/basicblock.cpp b/basicblock.cpp
index 7eb37c57..c2a2bddf 100644
--- a/basicblock.cpp
+++ b/basicblock.cpp
@@ -125,6 +125,7 @@ vector<BasicBlockEdge> BasicBlock::GetOutgoingEdges() const
 		BasicBlockEdge edge;
 		edge.type = array[i].type;
 		edge.target = array[i].target ? new BasicBlock(BNNewBasicBlockReference(array[i].target)) : nullptr;
+		edge.backEdge = array[i].backEdge;
 		result.push_back(edge);
 	}
 
@@ -144,6 +145,7 @@ vector<BasicBlockEdge> BasicBlock::GetIncomingEdges() const
 		BasicBlockEdge edge;
 		edge.type = array[i].type;
 		edge.target = array[i].target ? new BasicBlock(BNNewBasicBlockReference(array[i].target)) : nullptr;
+		edge.backEdge = array[i].backEdge;
 		result.push_back(edge);
 	}
 
@@ -397,5 +399,10 @@ void BasicBlock::SetUserBasicBlockHighlight(uint8_t r, uint8_t g, uint8_t b, uin
 
 bool BasicBlock::IsBackEdge(BasicBlock* source, BasicBlock* target)
 {
-	return source->GetDominators().count(target) != 0;
+	for (auto& i : source->GetOutgoingEdges())
+	{
+		if (i.target->GetObject() == target->GetObject())
+			return i.backEdge;
+	}
+	return false;
 }