Merge pull request #1927 from jbj/instructionNode

C++: Add DataFlow::instructionNode

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 {

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`.