Swift: adjust for changes in main

Author: rdmarsh2

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

@@ -61,8 +61,8 @@ module Ssa {
         AssignExpr a, BasicBlock bb, int i // TODO: use CFG node for assignment expr
       |
         this.definesAt(_, bb, i) and
-        a = bb.getNode(i).getNode() and
-        value.getNode() = a.getSource()
+        a = bb.getNode(i).getNode().asAstNode() and
+        value.getNode().asAstNode() = a.getSource()
       )
     }
   }

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

@@ -60,7 +60,7 @@ class ExprNode extends Node, TExprNode {
 
   ExprNode() { this = TExprNode(expr) }
 
-  override Expr asExpr() { result = expr.getNode() }
+  override Expr asExpr() { result = expr.getNode().asAstNode() }
 
   override ControlFlowNode getCfgNode() { result = expr }
 }

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

@@ -16,13 +16,13 @@ class SourceVariable = VarDecl;
 
 predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
   exists(AssignExpr assign |
-    bb.getNode(i).getNode() = assign and
+    bb.getNode(i).getNode().asAstNode() = assign and
     assign.getDest() = v.getAnAccess() and
     certain = true
   )
   or
   exists(PatternBindingDecl decl, Pattern pattern |
-    bb.getNode(i).getNode() = pattern and
+    bb.getNode(i).getNode().asAstNode() = pattern and
     decl.getAPattern() = pattern and
     v.getParentPattern() = pattern and
     certain = true
@@ -34,7 +34,7 @@ private predicate isLValue(DeclRefExpr ref) { any(AssignExpr assign).getDest() =
 predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
   exists(DeclRefExpr ref |
     not isLValue(ref) and
-    bb.getNode(i).getNode() = ref and
+    bb.getNode(i).getNode().asAstNode() = ref and
     v = ref.getDecl() and
     certain = true
   )

swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected

@@ -1,11 +1,14 @@
-| file://:0:0:0:0 | Phi | test.swift:15:15:15:15 | DeclRefExpr[VarDecl[var t2]] |
-| test.swift:6:9:6:13 | WriteDef | test.swift:7:15:7:15 | DeclRefExpr[VarDecl[var t1]] |
-| test.swift:7:15:7:15 | DeclRefExpr[VarDecl[var t1]] | test.swift:8:10:8:10 | DeclRefExpr[VarDecl[var t1]] |
-| test.swift:8:5:8:10 | WriteDef | test.swift:10:15:10:15 | DeclRefExpr[VarDecl[var t2]] |
-| test.swift:8:10:8:10 | DeclRefExpr[VarDecl[var t1]] | test.swift:8:5:8:10 | WriteDef |
-| test.swift:8:10:8:10 | DeclRefExpr[VarDecl[var t1]] | test.swift:9:15:9:15 | DeclRefExpr[VarDecl[var t1]] |
-| test.swift:9:15:9:15 | DeclRefExpr[VarDecl[var t1]] | test.swift:11:8:11:8 | DeclRefExpr[VarDecl[var t1]] |
-| test.swift:12:9:12:14 | WriteDef | test.swift:13:19:13:19 | DeclRefExpr[VarDecl[var t2]] |
-| test.swift:12:14:12:14 | IntegerLiteralExpr(0) | test.swift:12:9:12:14 | WriteDef |
-| test.swift:17:5:17:10 | WriteDef | test.swift:21:15:21:15 | DeclRefExpr[VarDecl[var t1]] |
-| test.swift:17:10:17:10 | IntegerLiteralExpr(0) | test.swift:17:5:17:10 | WriteDef |
+| file://:0:0:0:0 | Phi | test.swift:15:15:15:15 | DeclRefExpr |
+| file://:0:0:0:0 | Phi | test.swift:21:15:21:15 | DeclRefExpr |
+| test.swift:6:9:6:13 | WriteDef | test.swift:7:15:7:15 | DeclRefExpr |
+| test.swift:7:15:7:15 | DeclRefExpr | test.swift:8:10:8:10 | DeclRefExpr |
+| test.swift:8:5:8:10 | WriteDef | test.swift:10:15:10:15 | DeclRefExpr |
+| test.swift:8:10:8:10 | DeclRefExpr | test.swift:8:5:8:10 | WriteDef |
+| test.swift:8:10:8:10 | DeclRefExpr | test.swift:9:15:9:15 | DeclRefExpr |
+| test.swift:9:15:9:15 | DeclRefExpr | test.swift:11:8:11:8 | DeclRefExpr |
+| test.swift:12:9:12:14 | WriteDef | test.swift:13:19:13:19 | DeclRefExpr |
+| test.swift:12:14:12:14 | IntegerLiteralExpr | test.swift:12:9:12:14 | WriteDef |
+| test.swift:15:15:15:15 | DeclRefExpr | test.swift:19:14:19:14 | DeclRefExpr |
+| test.swift:17:10:17:10 | IntegerLiteralExpr | test.swift:17:5:17:10 | WriteDef |
+| test.swift:19:14:19:14 | DeclRefExpr | test.swift:19:9:19:14 | WriteDef |
+| test.swift:19:14:19:14 | DeclRefExpr | test.swift:19:14:19:14 | DeclRefExpr |