Avoid crashing the renderer on bad layouts

spcl · Oct 30, 2024 · 96b182f · 96b182f
1 parent 9944b47
commit 96b182f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/layouter/layout.ts b/src/layouter/layout.ts
@@ -1004,7 +1004,7 @@ function layoutControlFlowRegion(
         // Fall back to dagre for anything that cannot be laid out with
         // the vertical layout (e.g., irreducible control flow).
         try {
-            SMLayouter.layoutDagreCompat(g, sdfg.start_block?.toString());
+            SMLayouter.layoutDagreCompat(g, cfg.start_block?.toString());
         } catch (_ignored) {
             dagre.layout(g);
         }

diff --git a/src/layouter/state_machine/sm_layouter.ts b/src/layouter/state_machine/sm_layouter.ts
@@ -276,6 +276,23 @@ export class SMLayouter {
                 'The following edges were not routed:',
                 unrouted
             );
+            // To avoid crashing, simply straight-route these edges.
+            for (const edge of unrouted) {
+                const srcNode = this.graph.get((edge as any).src);
+                const dstNode = this.graph.get((edge as any).dst);
+                if (!srcNode || !dstNode)
+                    throw Error('Unrouted edge may not be straight-routed.');
+                edge.points = [
+                    {
+                        x: srcNode.x,
+                        y: srcNode.y + (srcNode.height / 2),
+                    },
+                    {
+                        x: dstNode.x,
+                        y: dstNode.y - (dstNode.height / 2),
+                    },
+                ];
+            }
         }
     }