github · tausbn · Aug 14, 2020 · Jul 27, 2020 · Jul 28, 2020 · Jul 28, 2020
diff --git a/python/ql/src/experimental/dataflow/internal/DataFlowPrivate.qll b/python/ql/src/experimental/dataflow/internal/DataFlowPrivate.qll
@@ -97,8 +97,65 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo) {
 //--------
 // Global flow
 //--------
+/**
+ * IPA type for DataFlowCallable.
+ * A callable is either a callable value or a class.
+ */
+newtype TDataFlowCallable =
+  TCallableValue(CallableValue callable) or
+  TClassValue(ClassValue c)
+
 /** Represents a callable */
-class DataFlowCallable = CallableValue;
+abstract class DataFlowCallable extends TDataFlowCallable {
+  /** Gets a textual representation of this element. */
+  abstract string toString();
+
+  /** Gets a call to this callable. */
+  abstract CallNode getACall();
+
+  /** Gets the scope of this callable */
+  abstract Scope getScope();
+
+  /** Gets the specified parameter of this callable */
+  abstract NameNode getParameter(int n);
+
+  /** Gets the name of this callable. */
+  abstract string getName();
+}
+
+class DataFlowCallableValue extends DataFlowCallable, TCallableValue {
+  CallableValue callable;
+
+  DataFlowCallableValue() { this = TCallableValue(callable) }
+
+  override string toString() { result = callable.toString() }
+
+  override CallNode getACall() { result = callable.getACall() }
+
+  override Scope getScope() { result = callable.getScope() }
+
+  override NameNode getParameter(int n) { result = callable.getParameter(n) }
+
+  override string getName() { result = callable.getName() }
+}
+
+class DataFlowClassValue extends DataFlowCallable, TClassValue {
+  ClassValue c;
+
+  DataFlowClassValue() { this = TClassValue(c) }
+
+  override string toString() { result = c.toString() }
+
+  override CallNode getACall() { result = c.getACall() }
+
+  override Scope getScope() { result = c.getScope() }
+
+  override NameNode getParameter(int n) {
+    result.getNode() = c.getScope().getInitMethod().getArg(n + 1).asName()
+  }
+
+  override string getName() { result = c.getName() }
+}
 
 /** Represents a call to a callable */
 class DataFlowCall extends CallNode {

diff --git a/python/ql/test/experimental/dataflow/basic/callGraph.ql b/python/ql/test/experimental/dataflow/basic/callGraph.ql
@@ -1,4 +1,4 @@
-import callGraphConfig
+import experimental.dataflow.callGraphConfig
 
 from DataFlow::Node source, DataFlow::Node sink
 where exists(CallGraphConfig cfg | cfg.hasFlow(source, sink))

diff --git a/python/ql/test/experimental/dataflow/basic/callGraphSinks.ql b/python/ql/test/experimental/dataflow/basic/callGraphSinks.ql
@@ -1,4 +1,4 @@
-import callGraphConfig
+import experimental.dataflow.callGraphConfig
 
 from DataFlow::Node sink
 where exists(CallGraphConfig cfg | cfg.isSink(sink))

diff --git a/python/ql/test/experimental/dataflow/basic/callGraphSources.ql b/python/ql/test/experimental/dataflow/basic/callGraphSources.ql
@@ -1,4 +1,4 @@
-import callGraphConfig
+import experimental.dataflow.callGraphConfig
 
 from DataFlow::Node source
 where exists(CallGraphConfig cfg | cfg.isSource(source))

diff --git a/...mental/dataflow/basic/callGraphConfig.qll → ...experimental/dataflow/callGraphConfig.qll b/...mental/dataflow/basic/callGraphConfig.qll → ...experimental/dataflow/callGraphConfig.qll
diff --git a/python/ql/test/experimental/dataflow/consistency/dataflow-consistency.expected b/python/ql/test/experimental/dataflow/consistency/dataflow-consistency.expected
@@ -101,3 +101,5 @@ argHasPostUpdate
 | test.py:74:17:74:17 | ControlFlowNode for t | ArgumentNode is missing PostUpdateNode. |
 | test.py:81:13:81:13 | ControlFlowNode for t | ArgumentNode is missing PostUpdateNode. |
 | test.py:86:13:86:13 | ControlFlowNode for t | ArgumentNode is missing PostUpdateNode. |
+| test.py:158:15:158:15 | ControlFlowNode for l | ArgumentNode is missing PostUpdateNode. |
+| test.py:159:15:159:15 | ControlFlowNode for d | ArgumentNode is missing PostUpdateNode. |