Swift: switch to shared, parameterized CFG library

swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll

@@ -167,7 +167,7 @@ private predicate entryBB(BasicBlock bb) { bb.getFirstNode() instanceof EntryNod
 class EntryBasicBlock extends BasicBlock {
   EntryBasicBlock() { entryBB(this) }
 
-  override CfgScope getScope() { this.getFirstNode() = TEntryNode(result) }
+  override CfgScope getScope() { this.getFirstNode() = any(EntryNode node | node.getScope() = result) }
 }
 
 /**

swift/ql/lib/codeql/swift/controlflow/CfgNodes.qll

@@ -7,104 +7,35 @@ private import internal.ControlFlowGraphImpl
 private import internal.ControlFlowElements
 private import internal.Splitting
 
-/** An entry node for a given scope. */
-class EntryNode extends ControlFlowNode, TEntryNode {
-  private CfgScope scope;
-
-  EntryNode() { this = TEntryNode(scope) }
-
-  final override EntryBasicBlock getBasicBlock() { result = ControlFlowNode.super.getBasicBlock() }
-
-  final override Location getLocation() { result = scope.getLocation() }
-
-  final override string toString() { result = "enter " + scope }
-}
-
-/** An exit node for a given scope, annotated with the type of exit. */
-class AnnotatedExitNode extends ControlFlowNode, TAnnotatedExitNode {
-  private CfgScope scope;
-  private boolean normal;
-
-  AnnotatedExitNode() { this = TAnnotatedExitNode(scope, normal) }
-
-  /** Holds if this node represent a normal exit. */
-  final predicate isNormal() { normal = true }
-
-  final override AnnotatedExitBasicBlock getBasicBlock() {
-    result = ControlFlowNode.super.getBasicBlock()
-  }
-
-  final override Location getLocation() { result = scope.getLocation() }
-
-  final override string toString() {
-    exists(string s |
-      normal = true and s = "normal"
-      or
-      normal = false and s = "abnormal"
-    |
-      result = "exit " + scope + " (" + s + ")"
-    )
-  }
-}
-
-/** An exit node for a given scope. */
-class ExitNode extends ControlFlowNode, TExitNode {
-  private CfgScope scope;
-
-  ExitNode() { this = TExitNode(scope) }
-
-  final override Location getLocation() { result = scope.getLocation() }
-
-  final override string toString() { result = "exit " + scope }
-}
-
 /**
  * A node for an AST node.
  *
  * Each AST node maps to zero or more `CfgNode`s: zero when the node is unreachable
  * (dead) code or not important for control flow, and multiple when there are different
  * splits for the AST node.
  */
-class CfgNode extends ControlFlowNode, TElementNode {
-  private Splits splits;
-  ControlFlowElement n;
+class CfgNode extends ControlFlowNode instanceof AstCfgNode {
+  final override ControlFlowElement getNode() { result = this.getAstNode() }
 
-  CfgNode() { this = TElementNode(_, n, splits) }
-
-  final override ControlFlowElement getNode() { result = n }
-
-  override Location getLocation() { result = n.getLocation() }
-
-  final override string toString() {
-    exists(string s | s = n.toString() |
-      result = "[" + this.getSplitsString() + "] " + s
-      or
-      not exists(this.getSplitsString()) and result = s
-    )
-  }
+  /** Gets a split for this control flow node, if any. */
+  final Split getASplit() { result = super.getASplit() }
 
   /** Gets a comma-separated list of strings for each split in this node, if any. */
-  final string getSplitsString() {
-    result = splits.toString() and
-    result != ""
-  }
-
-  /** Gets a split for this control flow node, if any. */
-  final Split getASplit() { result = splits.getASplit() }
+  final string getSplitsString() { result = super.getSplitsString() }
 
   /** Gets the AST representation of this control flow node, if any. */
   Expr getAst() {
-    result = n.asAstNode()
+    result = this.getNode().asAstNode()
     or
-    result = n.(PropertyGetterElement).getRef()
+    result = this.getNode().(PropertyGetterElement).getRef()
     or
-    result = n.(PropertySetterElement).getAssignExpr()
+    result = this.getNode().(PropertySetterElement).getAssignExpr()
     or
-    result = n.(PropertyObserverElement).getAssignExpr()
+    result = this.getNode().(PropertyObserverElement).getAssignExpr()
     or
-    result = n.(ClosureElement).getAst()
+    result = this.getNode().(ClosureElement).getAst()
     or
-    result = n.(KeyPathElement).getAst()
+    result = this.getNode().(KeyPathElement).getAst()
   }
 }
 
@@ -130,7 +61,11 @@ class PatternCfgNode extends CfgNode {
 
 /** A control-flow node that wraps a property getter. */
 class PropertyGetterCfgNode extends CfgNode {
-  override PropertyGetterElement n;
+  PropertyGetterElement n;
+
+  PropertyGetterCfgNode() {
+    n = this.getAstNode()
+  }
 
   Expr getRef() { result = n.getRef() }
 
@@ -141,8 +76,11 @@ class PropertyGetterCfgNode extends CfgNode {
 
 /** A control-flow node that wraps a property setter. */
 class PropertySetterCfgNode extends CfgNode {
-  override PropertySetterElement n;
+  PropertySetterElement n;
 
+  PropertySetterCfgNode() {
+    n = this.getAstNode()
+  }
   AssignExpr getAssignExpr() { result = n.getAssignExpr() }
 
   CfgNode getBase() { result.getAst() = n.getBase() }
@@ -153,8 +91,11 @@ class PropertySetterCfgNode extends CfgNode {
 }
 
 class PropertyObserverCfgNode extends CfgNode {
-  override PropertyObserverElement n;
+  PropertyObserverElement n;
 
+  PropertyObserverCfgNode() {
+    n = this.getAstNode()
+  }
   AssignExpr getAssignExpr() { result = n.getAssignExpr() }
 
   CfgNode getBase() { result.getAst() = n.getBase() }

swift/ql/lib/codeql/swift/controlflow/ControlFlowGraph.qll

@@ -27,7 +27,7 @@ class CfgScope extends Scope instanceof CfgScope::Range_ {
  *
  * Only nodes that can be reached from an entry point are included in the CFG.
  */
-class ControlFlowNode extends TCfgNode {
+class ControlFlowNode extends Node {
   /** Gets a textual representation of this control flow node. */
   string toString() { none() }
 
@@ -50,7 +50,7 @@ class ControlFlowNode extends TCfgNode {
   BasicBlock getBasicBlock() { result.getANode() = this }
 
   /** Gets a successor node of a given type, if any. */
-  final ControlFlowNode getASuccessor(SuccessorType t) { result = getASuccessor(this, t) }
+  final ControlFlowNode getASuccessor(SuccessorType t) { result = super.getASuccessor(t) }
 
   /** Gets an immediate successor, if any. */
   final ControlFlowNode getASuccessor() { result = this.getASuccessor(_) }

swift/ql/lib/codeql/swift/controlflow/internal/AstControlFlowTrees.qll

@@ -1,6 +1,6 @@
 private import swift
 private import Completion
-private import ControlFlowGraphImplShared
+private import ControlFlowGraphParameter::CfgImpl
 private import ControlFlowElements
 
 abstract class AstControlFlowTree extends ControlFlowTree {