generic-cfg-builder: the end of a function is now mapped to the last statement, for purposes of CFG node mapping

Author: tmr232

src/control-flow/generic-cfg-builder.ts

@@ -40,8 +40,17 @@ export class GenericCFGBuilder {
       // `entry` will be non-null for any valid code
       if (entry) this.builder.addEdge(startNode, entry);
       if (exit) this.builder.addEdge(exit, endNode);
+
+
+      // Make sure the end of the function is linked to the last piece of code, not to the top of the function.
+      const lastStatement = bodySyntax.namedChildren[bodySyntax.namedChildren.length - 1];
+      if (lastStatement) {
+        this.nodeMapper.linkGap(lastStatement, functionNode, { includeTo: true, reverse: true });
+        console.log(lastStatement.text)
+      }
     }
 
+
     return {
       graph: this.builder.getGraph(),
       entry: startNode,