Python: Separate callable for lambdas

yoff · yoff · commit d3e0e84c37bd · 2021-01-26T21:17:59.000+01:00
Since lambdas are split, but their children are not,
we use the Function as the callable.
diff --git a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -498,10 +498,13 @@ import ArgumentPassing
  */
 newtype TDataFlowCallable =
   TCallableValue(CallableValue callable) {
-    callable instanceof FunctionValue
+    callable instanceof FunctionValue and
+    // TODO: push into FunctionValue
+    not callable.(FunctionValue).getOrigin().getNode() instanceof Lambda
     or
     callable instanceof ClassValue
   } or
+  TLambda(Function lambda) { lambda.getName() = "lambda" } or
   TModule(Module m)
 
 /** Represents a callable. */
@@ -544,6 +547,27 @@ class DataFlowCallableValue extends DataFlowCallable, TCallableValue {
   override CallableValue getCallableValue() { result = callable }
 }
 
+/** A class representing a callable lambda. */
+class DataFlowLambda extends DataFlowCallable, TLambda {
+  Function lambda;
+
+  DataFlowLambda() { this = TLambda(lambda) }
+
+  override string toString() { result = lambda.toString() }
+
+  override CallNode getACall() { result = getCallableValue().getACall() }
+
+  override Scope getScope() { result = lambda.getEvaluatingScope() }
+
+  override NameNode getParameter(int n) { result = getParameter(getCallableValue(), n) }
+
+  override string getName() { result = "Lambda callable" }
+
+  override CallableValue getCallableValue() {
+    result.(FunctionValue).getOrigin().getNode() = lambda.getDefinition()
+  }
+}
+
 /** A class representing the scope in which a `ModuleVariableNode` appears. */
 class DataFlowModuleScope extends DataFlowCallable, TModule {
   Module mod;
diff --git a/python/ql/test/experimental/dataflow/consistency/dataflow-consistency.expected b/python/ql/test/experimental/dataflow/consistency/dataflow-consistency.expected
@@ -1,16 +1,11 @@
 uniqueEnclosingCallable
-| test.py:256:18:256:18 | ControlFlowNode for x | Node should have one enclosing callable but has 2. |
-| test.py:256:18:256:18 | SSA variable x | Node should have one enclosing callable but has 2. |
-| test.py:256:21:256:25 | ControlFlowNode for False | Node should have one enclosing callable but has 2. |
 uniqueType
 uniqueNodeLocation
 missingLocation
 uniqueNodeToString
 missingToString
 parameterCallable
-| test.py:256:18:256:18 | ControlFlowNode for x | Callable mismatch for parameter. |
 localFlowIsLocal
-| test.py:256:18:256:18 | ControlFlowNode for x | test.py:256:18:256:18 | SSA variable x | Local flow step does not preserve enclosing callable. |
 compatibleTypesReflexive
 unreachableNodeCCtx
 localCallNodes
