Swift: Replace 'CallExpr' with 'ApplyExpr'. This is needed because not all the calls inside the interpolated string computations are 'CallExpr's.

Author: MathiasVP

swift/ql/lib/codeql/swift/dataflow/Ssa.qll

@@ -75,7 +75,7 @@ module Ssa {
     cached
     predicate isInoutDef(ExprCfgNode argument) {
       exists(
-        CallExpr c, BasicBlock bb, int blockIndex, int argIndex, VarDecl v, InOutExpr argExpr // TODO: use CFG node for assignment expr
+        ApplyExpr c, BasicBlock bb, int blockIndex, int argIndex, VarDecl v, InOutExpr argExpr // TODO: use CFG node for assignment expr
       |
         this.definesAt(v, bb, blockIndex) and
         bb.getNode(blockIndex).getNode().asAstNode() = c and

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll

@@ -203,7 +203,7 @@ abstract class ArgumentNode extends Node {
 
 private module ArgumentNodes {
   class NormalArgumentNode extends ExprNode, ArgumentNode {
-    NormalArgumentNode() { exists(CallExpr call | call.getAnArgument().getExpr() = this.asExpr()) }
+    NormalArgumentNode() { exists(ApplyExpr call | call.getAnArgument().getExpr() = this.asExpr()) }
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
       call.asCall().getArgument(pos.(PositionalArgumentPosition).getIndex()).getExpr() =

swift/ql/lib/codeql/swift/dataflow/internal/SsaImplSpecific.qll

@@ -29,7 +29,7 @@ predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain)
     certain = true
   )
   or
-  exists(CallExpr call, Argument arg |
+  exists(ApplyExpr call, Argument arg |
     arg.getExpr().(InOutExpr).getSubExpr() = v.getAnAccess() and
     call.getAnArgument() = arg and
     bb.getNode(i).getNode().asAstNode() = call and