Python: Omit all unresolved parameter nodes.

yoff · yoff · commit 89e56707c389 · 2021-01-24T16:16:07.000+01:00
Drops the results further to 139.
diff --git a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowPublic.qll b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -181,8 +181,8 @@ class ParameterNode extends CfgNode {
 
   ParameterNode() {
     node = def.getDefiningNode() and
-    // Disregard parameters to the function the extractor has synthesised for comprehensions
-    not def.getScope() = any(Comp comp).getNthInnerLoop(0).getIter().getScope()
+    // Disregard parameters that we cannot resolve
+    exists(DataFlowCallable c | node = c.getParameter(_))
   }
 
   /**
diff --git a/python/ql/test/experimental/dataflow/consistency/dataflow-consistency.expected b/python/ql/test/experimental/dataflow/consistency/dataflow-consistency.expected
@@ -1,5 +1,4 @@
 uniqueEnclosingCallable
-| test.py:239:27:239:27 | ControlFlowNode for p | Node should have one enclosing callable but has 0. |
 uniqueType
 uniqueNodeLocation
 missingLocation

Original file line number	Diff line number	Diff line change
`@@ -181,8 +181,8 @@ class ParameterNode extends CfgNode {`
`181`	`181`
`182`	`182`	`ParameterNode() {`
`183`	`183`	`node = def.getDefiningNode() and`
`184`		`- // Disregard parameters to the function the extractor has synthesised for comprehensions`
`185`		`- not def.getScope() = any(Comp comp).getNthInnerLoop(0).getIter().getScope()`
	`184`	`+ // Disregard parameters that we cannot resolve`
	`185`	`+ exists(DataFlowCallable c \| node = c.getParameter(_))`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`uniqueEnclosingCallable`
`2`		`-\| test.py:239:27:239:27 \| ControlFlowNode for p \| Node should have one enclosing callable but has 0. \|`
`3`	`2`	`uniqueType`
`4`	`3`	`uniqueNodeLocation`
`5`	`4`	`missingLocation`