Data flow: Add more consistency checks

Author: hvitved

csharp/ql/consistency-queries/DataFlowConsistency.ql

@@ -75,8 +75,3 @@ private module Input implements InputSig<CsharpDataFlow> {
 }
 
 import MakeConsistency<CsharpDataFlow, CsharpTaintTracking, Input>
-
-query predicate multipleToString(DataFlow::Node n, string s) {
-  s = strictconcat(n.toString(), ",") and
-  strictcount(n.toString()) > 1
-}

ruby/ql/consistency-queries/DataFlowConsistency.ql

@@ -38,8 +38,3 @@ private module Input implements InputSig<RubyDataFlow> {
 }
 
 import MakeConsistency<RubyDataFlow, RubyTaintTracking, Input>
-
-query predicate multipleToString(DataFlow::Node n, string s) {
-  s = strictconcat(n.toString(), ",") and
-  strictcount(n.toString()) > 1
-}

shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll

@@ -147,6 +147,11 @@ module MakeConsistency<
     )
   }
 
+  query predicate multipleNodeToString(Node n, string msg) {
+    msg = "Multiple toStrings: " + strictconcat(n.toString(), ",") and
+    strictcount(n.toString()) > 1
+  }
+
   query predicate missingToString(string msg) {
     exists(int c |
       c = strictcount(Node n | not exists(n.toString())) and
@@ -287,4 +292,15 @@ module MakeConsistency<
     not Input::identityLocalStepExclude(n) and
     msg = "Node steps to itself"
   }
+
+  query predicate missingArgumentCall(ArgumentNode arg, string msg) {
+    not isArgumentNode(arg, _, _) and
+    msg = "Missing call for argument node."
+  }
+
+  query predicate multipleArgumentCall(ArgumentNode arg, DataFlowCall call, string msg) {
+    isArgumentNode(arg, call, _) and
+    strictcount(DataFlowCall call0 | isArgumentNode(arg, call0, _)) > 1 and
+    msg = "Multiple calls for argument node."
+  }
 }