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

commercial builds

1 files changed, 3 insertions, 7 deletions

diff --git a/python/function.py b/python/function.py
index 34511cfa..8beebe66 100644
--- a/python/function.py
+++ b/python/function.py
@@ -948,20 +948,16 @@ class DisassemblyTextLine(object):
 
 
 class FunctionGraphEdge(object):
-	def __init__(self, branch_type, source, target, points):
+	def __init__(self, branch_type, source, target, points, back_edge):
 		self.type = BranchType(branch_type)
 		self.source = source
 		self.target = target
 		self.points = points
+		self.back_edge = back_edge
 
 	def __repr__(self):
 		return "<%s: %s>" % (self.type.name, repr(self.target))
 
-	@property
-	def back_edge(self):
-		"""Whether the edge is a back edge (end of a loop)"""
-		return self.target in self.source.basic_block.dominators
-
 
 class FunctionGraphBlock(object):
 	def __init__(self, handle):
@@ -1074,7 +1070,7 @@ class FunctionGraphBlock(object):
 			points = []
 			for j in xrange(0, edges[i].pointCount):
 				points.append((edges[i].points[j].x, edges[i].points[j].y))
-			result.append(FunctionGraphEdge(branch_type, self, target, points))
+			result.append(FunctionGraphEdge(branch_type, self, target, points, edges[i].backEdge))
 		core.BNFreeFunctionGraphBlockOutgoingEdgeList(edges, count.value)
 		return result