From b7705e83c2026ff3983fc0b83f9b083d3e8be4c5 Mon Sep 17 00:00:00 2001 From: bd-912 Date: Sat, 20 Apr 2024 01:03:23 -0600 Subject: CFG fix create edges only if nodes != (found by graphviz) --- vaporize/library/ControlFlowGraph.java | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'vaporize/library/ControlFlowGraph.java') diff --git a/vaporize/library/ControlFlowGraph.java b/vaporize/library/ControlFlowGraph.java index 364cec1..b4c995c 100644 --- a/vaporize/library/ControlFlowGraph.java +++ b/vaporize/library/ControlFlowGraph.java @@ -38,16 +38,24 @@ public class ControlFlowGraph { } protected String addEdge(CFGNode source, CFGNode dest) { - String ret = String.format("%d -> %d", - source.getInstruction().sourcePos.line, - dest.getInstruction().sourcePos.line); - MinimalLogger.info(String.format("Edge %s", - ret)); + /** + * Iff the CFGNodes are different, construct an edge between them. + * Returns a string capable of being manipulated by graphviz. + */ + String ret = ""; + if (!source.equals(dest)) { + ret = String.format("%d -> %d", + source.getInstruction().sourcePos.line, + dest.getInstruction().sourcePos.line); + MinimalLogger.info(String.format("Edge %s", + ret)); - source.addDest(dest); - dest.addSource(source); + source.addDest(dest); + dest.addSource(source); + ret += ";"; + } - return ret +";"; + return ret; } protected void setStart(CFGNode start) { -- cgit v1.2.3