wip

Author: hvitved

python/ql/test/TestUtilities/dataflow/testConfig.qll

@@ -25,14 +25,17 @@ import semmle.python.dataflow.new.DataFlow
 
 module TestConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
-    node.(DataFlow::CfgNode).getNode().(NameNode).getId() = "SOURCE"
-    or
-    node.(DataFlow::CfgNode).getNode().getNode().(StringLiteral).getS() = "source"
-    or
-    node.(DataFlow::CfgNode).getNode().getNode().(IntegerLiteral).getN() = "42"
-    or
-    node.(DataFlow::CfgNode).getNode().getNode().(FloatLiteral).getN() = "42.0"
-    // No support for complex numbers
+    // node.getLocation().getStartLine() = 201 and
+    (
+      node.(DataFlow::CfgNode).getNode().(NameNode).getId() = "SOURCE"
+      or
+      node.(DataFlow::CfgNode).getNode().getNode().(StringLiteral).getS() = "source"
+      or
+      node.(DataFlow::CfgNode).getNode().getNode().(IntegerLiteral).getN() = "42"
+      or
+      node.(DataFlow::CfgNode).getNode().getNode().(FloatLiteral).getN() = "42.0"
+      // No support for complex numbers
+    )
   }
 
   predicate isSink(DataFlow::Node node) {

python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.expected

@@ -1,10 +1,2 @@
 missingAnnotationOnSink
-| test.py:204:10:204:18 | test.py:204 | ERROR, you should add `# $ MISSING: flow` annotation | a.obj.foo |
-| test.py:569:6:569:15 | test.py:569 | ERROR, you should add `# $ MISSING: flow` annotation | a2.obj.foo |
-| test.py:618:6:618:15 | test.py:618 | ERROR, you should add `# $ MISSING: flow` annotation | a2.obj.foo |
-| test_global.py:165:6:165:15 | test_global.py:165 | ERROR, you should add `# $ MISSING: flow` annotation | a2.obj.foo |
 testFailures
-| test.py:204:21:204:56 | Comment # $ flow="SOURCE, l:-3 -> a.obj.foo" | Missing result: flow="SOURCE, l:-3 -> a.obj.foo" |
-| test.py:569:18:569:54 | Comment # $ flow="SOURCE, l:-3 -> a2.obj.foo" | Missing result: flow="SOURCE, l:-3 -> a2.obj.foo" |
-| test.py:618:18:618:54 | Comment # $ flow="SOURCE, l:-3 -> a2.obj.foo" | Missing result: flow="SOURCE, l:-3 -> a2.obj.foo" |
-| test_global.py:165:18:165:54 | Comment # $ flow="SOURCE, l:-3 -> a2.obj.foo" | Missing result: flow="SOURCE, l:-3 -> a2.obj.foo" |

shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll

@@ -959,8 +959,8 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
       this.asNode().(ArgNode).argumentOf(call_, pos_.asArgumentPosition())
       or
       // this.asNodeReverse() = getAnOutNodeExt(call_, pos_.asReturnKind()) and
-      this.asNodeReverse() = getAnOutNode(call_, pos_.asReturnKind().(ValueReturnKind).getKind()) and //and
-      not this.asNodeReverse() instanceof PostUpdateNode // needed for swift
+      this.asNodeReverse() = getAnOutNode(call_, pos_.asReturnKind().(ValueReturnKind).getKind()) //and //and
+      // not this.asNodeReverse() instanceof PostUpdateNode // needed for swift
       // call_.toString().matches("%GetBox1%")
     }
 
@@ -1090,9 +1090,6 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     cached
     predicate clearsContentSet(NodeEx n, ContentSet c) { clearsContent(n.asNode(), c) }
 
-    cached
-    predicate expectsContentCached(Node n, ContentSet c) { expectsContent(n, c) }
-
     cached
     predicate expectsContentSet(NodeEx n, ContentSet c) {
       expectsContent([n.asNode(), n.asNodeReverse()], c)
@@ -1467,7 +1464,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
               argumentValueFlowsThroughCand(arg, node, false)
             )
           ) and
-          not expectsContentCached(node, _)
+          not expectsContent(node, _)
         }
 
         pragma[nomagic]

swift/ql/test/TestUtilities/InlineFlowTest.qll

@@ -58,9 +58,13 @@ private predicate defaultSink(DataFlow::Node sink) {
 }
 
 module DefaultFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { defaultSource(source) }
+  predicate isSource(DataFlow::Node source) {
+    defaultSource(source) and source.getLocation().getStartLine() = 56
+  }
 
   predicate isSink(DataFlow::Node sink) { defaultSink(sink) }
+
+  predicate neverSkip(DataFlow::Node n) { any() }
 }
 
 module NoFlowConfig implements DataFlow::ConfigSig {