Data flow: Cache Cast(ing)Node

hvitved · hvitved · commit ade99c2c2b10 · 2021-04-27T19:05:11.000+02:00
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -1257,7 +1257,7 @@ private module LocalFlowBigStep {
    */
   private class FlowCheckNode extends Node {
     FlowCheckNode() {
-      this instanceof CastNode or
+      castNode(this) or
       clearsContentCached(this, _)
     }
   }
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
@@ -118,7 +118,7 @@ private module LambdaFlow {
     boolean toJump, DataFlowCallOption lastCall
   ) {
     revLambdaFlow0(lambdaCall, kind, node, t, toReturn, toJump, lastCall) and
-    if node instanceof CastNode or node instanceof ArgumentNode or node instanceof ReturnNode
+    if castNode(node) or node instanceof ArgumentNode or node instanceof ReturnNode
     then compatibleTypes(t, getNodeDataFlowType(node))
     else any()
   }
@@ -290,6 +290,20 @@ private module Cached {
     )
   }
 
+  cached
+  predicate castNode(Node n) { n instanceof CastNode }
+
+  cached
+  predicate castingNode(Node n) {
+    castNode(n) or
+    n instanceof ParameterNode or
+    n instanceof OutNodeExt or
+    // For reads, `x.f`, we want to check that the tracked type after the read (which
+    // is obtained by popping the head of the access path stack) is compatible with
+    // the type of `x.f`.
+    read(_, _, n)
+  }
+
   /**
    * Gets a viable target for the lambda call `call`.
    *
@@ -818,15 +832,7 @@ private module Cached {
  * A `Node` at which a cast can occur such that the type should be checked.
  */
 class CastingNode extends Node {
-  CastingNode() {
-    this instanceof ParameterNode or
-    this instanceof CastNode or
-    this instanceof OutNodeExt or
-    // For reads, `x.f`, we want to check that the tracked type after the read (which
-    // is obtained by popping the head of the access path stack) is compatible with
-    // the type of `x.f`.
-    read(_, _, this)
-  }
+  CastingNode() { castingNode(this) }
 }
 
 private predicate readStepWithTypes(

Original file line number	Diff line number	Diff line change
`@@ -1257,7 +1257,7 @@ private module LocalFlowBigStep {`
`1257`	`1257`	`*/`
`1258`	`1258`	`private class FlowCheckNode extends Node {`
`1259`	`1259`	`FlowCheckNode() {`
`1260`		`- this instanceof CastNode or`
	`1260`	`+ castNode(this) or`
`1261`	`1261`	`clearsContentCached(this, _)`
`1262`	`1262`	`}`
`1263`	`1263`	`}`