Ruby: Cache more predicates

hvitved · hvitved · commit cdf59e1e1d40 · 2023-12-11T10:15:17.000+01:00
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
@@ -212,12 +212,14 @@ class ExprNode extends Node, TExprNode {
  * The value of a parameter at function entry, viewed as a node in a data
  * flow graph.
  */
-class ParameterNode extends LocalSourceNode instanceof ParameterNodeImpl {
+class ParameterNode extends LocalSourceNode {
+  ParameterNode() { exists(getParameterPosition(this, _)) }
+
   /** Gets the parameter corresponding to this node, if any. */
-  final Parameter getParameter() { result = super.getParameter() }
+  final Parameter getParameter() { result = getParameter(this) }
 
   /** Gets the callable that this parameter belongs to. */
-  final Callable getCallable() { result = super.getCfgScope() }
+  final Callable getCallable() { result = getCfgScope(this) }
 
   /** Gets the name of the parameter, if any. */
   final string getName() { result = this.getParameter().(NamedParameter).getName() }
@@ -348,9 +350,13 @@ class LocalSourceNode extends Node {
  * Nodes corresponding to AST elements, for example `ExprNode`, usually refer
  * to the value before the update.
  */
-class PostUpdateNode extends Node instanceof PostUpdateNodeImpl {
+class PostUpdateNode extends Node {
+  private Node pre;
+
+  PostUpdateNode() { pre = getPreUpdateNode(this) }
+
   /** Gets the node before the state update. */
-  Node getPreUpdateNode() { result = super.getPreUpdateNode() }
+  Node getPreUpdateNode() { result = pre }
 }
 
 /** An SSA definition, viewed as a node in a data flow graph. */
@@ -383,6 +389,28 @@ private module Cached {
     )
   }
 
+  cached
+  CfgScope getCfgScope(NodeImpl node) { result = node.getCfgScope() }
+
+  cached
+  ReturnNode getAReturnNode(Callable callable) { getCfgScope(result) = callable }
+
+  cached
+  Parameter getParameter(ParameterNodeImpl param) { result = param.getParameter() }
+
+  cached
+  ParameterPosition getParameterPosition(ParameterNodeImpl param, DataFlowCallable c) {
+    param.isParameterOf(c, result)
+  }
+
+  cached
+  ParameterPosition getSourceParameterPosition(ParameterNodeImpl param, Callable c) {
+    param.isSourceParameterOf(c, result)
+  }
+
+  cached
+  Node getPreUpdateNode(PostUpdateNodeImpl node) { result = node.getPreUpdateNode() }
+
   cached
   predicate methodHasSuperCall(MethodNode method, CallNode call) {
     call.isSuperCall() and method = call.getEnclosingMethod()
@@ -1271,7 +1299,7 @@ class CallableNode extends StmtSequenceNode {
   Callable asCallableAstNode() { result = callable }
 
   private ParameterPosition getParameterPosition(ParameterNodeImpl node) {
-    node.isSourceParameterOf(callable, result)
+    result = getSourceParameterPosition(node, callable)
   }
 
   /** Gets the `n`th positional parameter. */
@@ -1311,7 +1339,7 @@ class CallableNode extends StmtSequenceNode {
   /**
    * Gets a data flow node whose value is about to be returned by this callable.
    */
-  Node getAReturnNode() { result.(ReturnNode).(NodeImpl).getCfgScope() = callable }
+  Node getAReturnNode() { result = getAReturnNode(callable) }
 
   /**
    * DEPRECATED. Use `getAReturnNode` instead.
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -2724,7 +2724,7 @@ module MakeImpl<InputSig Lang> {
       pragma[noinline]
       ApHeadContent getHeadContent(Ap ap) { result = ap.getHead() }
 
-      predicate projectToHeadContent = getContentApprox/1;
+      predicate projectToHeadContent = getContentApproxCached/1;
 
       class ApOption = ApproxAccessPathFrontOption;
 
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -975,6 +975,9 @@ module MakeImplCommon<InputSig Lang> {
     cached
     predicate paramMustFlow(ParamNode p, ArgNode arg) { localMustFlowStep+(p, arg) }
 
+    cached
+    ContentApprox getContentApproxCached(Content c) { result = getContentApprox(c) }
+
     cached
     newtype TCallContext =
       TAnyCallContext() or
@@ -1885,7 +1888,7 @@ module MakeImplCommon<InputSig Lang> {
     Content getAHead() {
       exists(ContentApprox cont |
         this = TApproxFrontHead(cont) and
-        cont = getContentApprox(result)
+        cont = getContentApproxCached(result)
       )
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -975,6 +975,9 @@ module MakeImplCommon<InputSig Lang> {`
`975`	`975`	`cached`
`976`	`976`	`predicate paramMustFlow(ParamNode p, ArgNode arg) { localMustFlowStep+(p, arg) }`
`977`	`977`
	`978`	`+ cached`
	`979`	`+ ContentApprox getContentApproxCached(Content c) { result = getContentApprox(c) }`
	`980`	`+`
`978`	`981`	`cached`
`979`	`982`	`newtype TCallContext =`
`980`	`983`	`TAnyCallContext() or`
`@@ -1885,7 +1888,7 @@ module MakeImplCommon<InputSig Lang> {`
`1885`	`1888`	`Content getAHead() {`
`1886`	`1889`	`exists(ContentApprox cont \|`
`1887`	`1890`	`this = TApproxFrontHead(cont) and`
`1888`		`- cont = getContentApprox(result)`
	`1891`	`+ cont = getContentApproxCached(result)`
`1889`	`1892`	`)`
`1890`	`1893`	`}`
`1891`	`1894`	`}`