C++: Make ControlFlowNode's predicates concrete

jbj · jbj · commit 1ed4a489ece3 · 2018-08-24T22:03:59.000+02:00
The presence of abstract predicates on this class made it hard to
specialize it, and this is one of the reasons why the raw db-type
`@cfgnode` is often used in preference to `ControlFlowNode`.
diff --git a/cpp/ql/src/semmle/code/cpp/controlflow/ControlFlowGraph.qll b/cpp/ql/src/semmle/code/cpp/controlflow/ControlFlowGraph.qll
@@ -34,10 +34,14 @@ class ControlFlowNode extends Locatable, @cfgnode {
   ControlFlowNode getAPredecessor() { this = result.getASuccessor() }
 
   /** Gets the function containing this control-flow node. */
-  abstract Function getControlFlowScope();
+  Function getControlFlowScope() {
+    none() // overridden in subclasses
+  }
 
   /** Gets the smallest statement containing this control-flow node. */
-  abstract Stmt getEnclosingStmt();
+  Stmt getEnclosingStmt() {
+    none() // overridden in subclasses
+  }
 
   /**
    * Holds if this node is the top-level expression of a conditional statement,
