Swift: fix QL libraries

Author: redsun82

swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll

@@ -6,6 +6,8 @@ private import internal.ControlFlowGraphImpl
 private import internal.ControlFlowElements
 private import CfgNodes
 private import SuccessorTypes
+private import codeql.swift.generated.Db
+private import codeql.swift.generated.IpaTypes
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -195,9 +197,12 @@ class ExitBasicBlock extends BasicBlock {
 }
 
 private module JoinBlockPredecessors {
-  private predicate id(AstNode x, AstNode y) { x = y }
+  private predicate id(Db::AstNode x, Db::AstNode y) { x = y }
 
-  private predicate idOf(AstNode x, int y) = equivalenceRelation(id/2)(x, y)
+  private predicate idOfDbAstNode(Db::AstNode x, int y) = equivalenceRelation(id/2)(x, y)
+
+  // TODO does not work if we use "ipa on" entities...
+  private predicate idOf(AstNode x, int y) { idOfDbAstNode(Ipa::convertAstNodeToDb(x), y) }
 
   private AstNode projctToAst(ControlFlowElement n) {
     result = n.asAstNode()

swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll

@@ -33,6 +33,7 @@
 
 private import swift
 private import codeql.swift.controlflow.ControlFlowGraph
+private import codeql.swift.generated.IpaTypes
 private import Completion
 private import Scope
 import ControlFlowGraphImplShared
@@ -369,9 +370,9 @@ module Stmts {
    * Control-flow for loops.
    */
   module Loops {
-    class ConditionalLoop = @while_stmt or @repeat_while_stmt;
+    class ConditionalLoop = Ipa::TWhileStmt or Ipa::TRepeatWhileStmt;
 
-    class LoopStmt = @for_each_stmt or ConditionalLoop;
+    class LoopStmt = Ipa::TForEachStmt or ConditionalLoop;
 
     abstract class LoopTree extends AstPreOrderTree {
       LoopTree() { ast instanceof ConditionalLoop }
@@ -1668,7 +1669,8 @@ module Exprs {
   }
 
   module Conversions {
-    class ConversionOrIdentity = @identity_expr or @explicit_cast_expr or @implicit_conversion_expr;
+    class ConversionOrIdentity =
+      Ipa::TIdentityExpr or Ipa::TExplicitCastExpr or Ipa::TImplicitConversionExpr;
 
     abstract class ConversionOrIdentityTree extends AstStandardPostOrderTree {
       ConversionOrIdentityTree() { ast instanceof ConversionOrIdentity }

swift/ql/lib/codeql/swift/controlflow/internal/Scope.qll

@@ -1,8 +1,9 @@
 private import swift
 private import codeql.swift.generated.GetImmediateParent
+private import codeql.swift.generated.IpaTypes
 
 module CallableBase {
-  class TypeRange = @abstract_function_decl or @key_path_expr or @closure_expr;
+  class TypeRange = Ipa::TAbstractFunctionDecl or Ipa::TKeyPathExpr or Ipa::TClosureExpr;
 
   class Range extends Scope::Range, TypeRange { }
 }