Dataflow: Fix flow-feature bug.

aschackmull · aschackmull · commit 03f7968dbf6f · 2024-02-16T11:38:30.000+01:00
diff --git a/java/ql/test/library-tests/dataflow/flowfeature/flow.expected b/java/ql/test/library-tests/dataflow/flowfeature/flow.expected
@@ -1,7 +1,2 @@
 testFailures
-| A.java:16:14:16:47 | // $ EqCc="2" SrcCc="2" SinkCc="2" | Missing result:EqCc="2" |
-| A.java:16:14:16:47 | // $ EqCc="2" SrcCc="2" SinkCc="2" | Missing result:SrcCc="2" |
-| A.java:28:14:28:47 | // $ EqCc="4" SrcCc="4" SinkCc="4" | Missing result:EqCc="4" |
-| A.java:28:14:28:47 | // $ EqCc="4" SrcCc="4" SinkCc="4" | Missing result:SrcCc="4" |
-| A.java:42:14:42:27 | // $ SrcCc="6" | Missing result:SrcCc="6" |
 failures
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -1551,9 +1551,7 @@ module MakeImplCommon<InputSig Lang> {
   class CallContextSomeCall extends CallContextCall, TSomeCall {
     override string toString() { result = "CcSomeCall" }
 
-    override predicate relevantFor(DataFlowCallable callable) {
-      exists(ParamNode p | getNodeEnclosingCallable(p) = callable)
-    }
+    override predicate relevantFor(DataFlowCallable callable) { any() }
 
     override predicate matchesCall(DataFlowCall call) { any() }
   }

Original file line number	Diff line number	Diff line change
`@@ -1551,9 +1551,7 @@ module MakeImplCommon<InputSig Lang> {`
`1551`	`1551`	`class CallContextSomeCall extends CallContextCall, TSomeCall {`
`1552`	`1552`	`override string toString() { result = "CcSomeCall" }`
`1553`	`1553`
`1554`		`- override predicate relevantFor(DataFlowCallable callable) {`
`1555`		`- exists(ParamNode p \| getNodeEnclosingCallable(p) = callable)`
`1556`		`- }`
	`1554`	`+ override predicate relevantFor(DataFlowCallable callable) { any() }`
`1557`	`1555`
`1558`	`1556`	`override predicate matchesCall(DataFlowCall call) { any() }`
`1559`	`1557`	`}`