C++: Add DataFlow::instructionNode

jbj · jbj · commit c7e608107934 · 2019-09-12T11:44:17.000+02:00
This is for symmetry with `exprNode` etc., and it should be handy for
the same reasons. I found one caller of `asInstruction` that got simpler
by using the new predicate instead.
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
@@ -22,10 +22,7 @@ private predicate predictable(Expr expr) {
 
 // TODO: remove when `predictable` has an `Instruction` parameter instead of `Expr`.
 private predicate predictableInstruction(Instruction instr) {
-  exists(DataFlow::Node node |
-    node.asInstruction() = instr and
-    predictable(node.asExpr())
-  )
+  predictable(DataFlow::instructionNode(instr).asExpr())
 }
 
 private class DefaultTaintTrackingCfg extends DataFlow::Configuration {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -156,6 +156,11 @@ abstract class PostUpdateNode extends Node {
   abstract Node getPreUpdateNode();
 }
 
+/**
+ * Gets the node corresponding to `instr`.
+ */
+Node instructionNode(Instruction instr) { result.asInstruction() = instr }
+
 /**
  * Gets a `Node` corresponding to `e` or any of its conversions. There is no
  * result if `e` is a `Conversion`.
