Merge pull request #15582 from hvitved/dataflow/cache-viable-callable-ext

aschackmull · web-flow · commit 393251dde672 · 2024-02-14T10:31:43.000+01:00
Data flow: Cache `viableCallableExt`
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -386,7 +386,7 @@ module MakeImplCommon<InputSig Lang> {
   }
 
   private DataFlowCallable viableCallableExt(DataFlowCall call) {
-    result = viableCallable(call)
+    result = viableCallableCached(call)
     or
     result = viableCallableLambda(call, _)
   }
@@ -479,6 +479,9 @@ module MakeImplCommon<InputSig Lang> {
       isArgumentNode(n, call, pos)
     }
 
+    cached
+    DataFlowCallable viableCallableCached(DataFlowCall call) { result = viableCallable(call) }
+
     /**
      * Gets a viable target for the lambda call `call`.
      *

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ module MakeImplCommon<InputSig Lang> {`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`private DataFlowCallable viableCallableExt(DataFlowCall call) {`
`389`		`- result = viableCallable(call)`
	`389`	`+ result = viableCallableCached(call)`
`390`	`390`	`or`
`391`	`391`	`result = viableCallableLambda(call, _)`
`392`	`392`	`}`
`@@ -479,6 +479,9 @@ module MakeImplCommon<InputSig Lang> {`
`479`	`479`	`isArgumentNode(n, call, pos)`
`480`	`480`	`}`
`481`	`481`
	`482`	`+ cached`
	`483`	`+ DataFlowCallable viableCallableCached(DataFlowCall call) { result = viableCallable(call) }`
	`484`	`+`
`482`	`485`	`/**`
`483`	`486`	* Gets a viable target for the lambda call `call`.
`484`	`487`	`*`