Swift: fix derived IPA type properties

Also rename `IpaTypes.qll` to `Ipa.qll`
2026-04-29 18:55:14 +02:00 · 2022-07-28 10:11:36 +02:00
parent f81abe40c4
commit 457ce3d884
295 changed files with 313 additions and 317 deletions
--- a/swift/codegen/generators/qlgen.py
+++ b/swift/codegen/generators/qlgen.py
@@ -29,7 +29,7 @@ class ModifiedStubMarkedAsGeneratedError(Error):
    pass


-def get_ql_property(cls: schema.Class, source: schema.Class, prop: schema.Property) -> ql.Property:
+def get_ql_property(cls: schema.Class, prop: schema.Property) -> ql.Property:
    args = dict(
        type=prop.type if not prop.is_predicate else "predicate",
        qltest_skip="qltest_skip" in prop.pragmas,
@@ -40,30 +40,30 @@ def get_ql_property(cls: schema.Class, source: schema.Class, prop: schema.Proper
    if prop.is_single:
        args.update(
            singular=inflection.camelize(prop.name),
-            tablename=inflection.tableize(source.name),
-            tableparams=["this"] + ["result" if p is prop else "_" for p in source.properties if p.is_single],
+            tablename=inflection.tableize(cls.name),
+            tableparams=["this"] + ["result" if p is prop else "_" for p in cls.properties if p.is_single],
        )
    elif prop.is_repeated:
        args.update(
            singular=inflection.singularize(inflection.camelize(prop.name)),
            plural=inflection.pluralize(inflection.camelize(prop.name)),
-            tablename=inflection.tableize(f"{source.name}_{prop.name}"),
+            tablename=inflection.tableize(f"{cls.name}_{prop.name}"),
            tableparams=["this", "index", "result"],
        )
    elif prop.is_optional:
        args.update(
            singular=inflection.camelize(prop.name),
-            tablename=inflection.tableize(f"{source.name}_{prop.name}"),
+            tablename=inflection.tableize(f"{cls.name}_{prop.name}"),
            tableparams=["this", "result"],
        )
    elif prop.is_predicate:
        args.update(
            singular=inflection.camelize(prop.name, uppercase_first_letter=False),
-            tablename=inflection.underscore(f"{source.name}_{prop.name}"),
+            tablename=inflection.underscore(f"{cls.name}_{prop.name}"),
            tableparams=["this"],
        )
    else:
-        raise ValueError(f"unknown property kind for {prop.name} from {source.name}")
+        raise ValueError(f"unknown property kind for {prop.name} from {cls.name}")
    return ql.Property(**args)


@@ -73,10 +73,8 @@ def get_ql_class(cls: schema.Class, lookup: typing.Dict[str, schema.Class]):
        name=cls.name,
        bases=cls.bases,
        final=not cls.derived,
-
-        properties=[get_ql_property(cls, cls, p) for p in cls.properties],
+        properties=[get_ql_property(cls, p) for p in cls.properties],
        dir=cls.dir,
-        has_db_id=not cls.ipa or cls.ipa.from_class,
        ipa=bool(cls.ipa),
        **pragmas,
    )
@@ -179,7 +177,7 @@ def _get_all_properties_to_be_tested(cls: schema.Class, lookup: typing.Dict[str,
    for c, p in _get_all_properties(cls, lookup):
        if not ("qltest_skip" in c.pragmas or "qltest_skip" in p.pragmas):
            # TODO here operations are duplicated, but should be better if we split ql and qltest generation
-            p = get_ql_property(cls, c, p)
+            p = get_ql_property(c, p)
            yield ql.PropertyForTest(p.getter, p.type, p.is_single, p.is_predicate, p.is_repeated)


@@ -282,7 +280,7 @@ def generate(opts, renderer):
        else:
            non_final_ipa_types.append(ipa_type)

-    renderer.render(ql.Ipa.Types(schema.root_class_name, final_ipa_types, non_final_ipa_types), out / "IpaTypes.qll")
+    renderer.render(ql.Ipa.Types(schema.root_class_name, final_ipa_types, non_final_ipa_types), out / "Ipa.qll")
    renderer.render(ql.ImportList(constructor_imports), out / "IpaConstructors.qll")

    renderer.cleanup(existing)
--- a/swift/codegen/lib/ql.py
+++ b/swift/codegen/lib/ql.py
@@ -79,7 +79,6 @@ class Class:
    qltest_skip: bool = False
    qltest_collapse_hierarchy: bool = False
    qltest_uncollapse_hierarchy: bool = False
-    has_db_id: bool = True
    ipa: bool = False

    def __post_init__(self):
@@ -96,9 +95,8 @@ class Class:
        return self.dir / self.name

    @property
-    def db_id(self) -> Optional[str]:
-        if self.has_db_id:
-            return "@" + inflection.underscore(self.name)
+    def db_id(self):
+        return "@" + inflection.underscore(self.name)


@dataclass
--- a/swift/codegen/templates/ql_class.mustache
+++ b/swift/codegen/templates/ql_class.mustache
@@ -1,5 +1,5 @@
 // generated by {{generator}}
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 {{#imports}}
 import {{.}}
@@ -28,12 +28,12 @@ class {{name}}Base extends Ipa::T{{name}}{{#bases}}, {{.}}{{/bases}} {

  {{#type_is_class}}
  {{type}} getImmediate{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
-    {{#has_db_id}}
+    {{^ipa}}
    result = Ipa::convert{{type}}FromDb(Ipa::convert{{name}}ToDb(this){{^root}}.(Db::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
-    {{/has_db_id}}
-    {{^has_db_id}}
+    {{/ipa}}
+    {{#ipa}}
    none()
-    {{/has_db_id}}
+    {{/ipa}}
  }

  final {{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
@@ -43,12 +43,12 @@ class {{name}}Base extends Ipa::T{{name}}{{#bases}}, {{.}}{{/bases}} {
  {{/type_is_class}}
  {{^type_is_class}}
  {{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
-    {{#has_db_id}}
+    {{^ipa}}
    {{^is_predicate}}result = {{/is_predicate}}Ipa::convert{{name}}ToDb(this){{^root}}.(Db::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}})
-    {{/has_db_id}}
-    {{^has_db_id}}
+    {{/ipa}}
+    {{#ipa}}
    none()
-    {{/has_db_id}}
+    {{/ipa}}
  }

  {{/type_is_class}}
--- a/swift/codegen/templates/ql_ipa_constructor_stub.mustache
+++ b/swift/codegen/templates/ql_ipa_constructor_stub.mustache
@@ -1,4 +1,4 @@
 // generated by {{generator}}, remove this comment if you wish to edit this file
-import codeql.swift.generated.Db
+private import codeql.swift.generated.Db

 predicate construct{{cls.name}}({{#cls.params}}{{^first}}, {{/first}}{{type}} {{param}}{{/cls.params}}) { none() }
--- a/swift/codegen/test/test_qlgen.py
+++ b/swift/codegen/test/test_qlgen.py
@@ -101,7 +101,7 @@ def _filter_generated_classes(ret, output_test_files=False):
            str(f): ret[ql_test_output_path() / f]
            for f in test_files
        }
-    base_files -= {pathlib.Path(f"{name}.qll") for name in ("Db", "IpaTypes", "IpaConstructors")}
+    base_files -= {pathlib.Path(f"{name}.qll") for name in ("Db", "Ipa", "IpaConstructors")}
    assert stub_files == base_files
    return {
        str(f): (ret[stub_path() / f], ret[ql_output_path() / f])
@@ -129,7 +129,7 @@ def test_empty(generate):
    assert generate([]) == {
        import_file(): ql.ImportList(),
        children_file(): ql.GetParentImplementation(),
-        ql_output_path() / "IpaTypes.qll": ql.Ipa.Types(schema.root_class_name),
+        ql_output_path() / "Ipa.qll": ql.Ipa.Types(schema.root_class_name),
        ql_output_path() / "IpaConstructors.qll": ql.ImportList(),
        ql_output_path() / "Db.qll": ql.DbClasses(),
        ql_output_path() / "Db.qll": ql.DbClasses(),
--- a/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll
@@ -7,7 +7,7 @@ private import internal.ControlFlowElements
 private import CfgNodes
 private import SuccessorTypes
 private import codeql.swift.generated.Db
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa

 /**
 * A basic block, that is, a maximal straight-line sequence of control flow nodes
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
@@ -33,7 +33,7 @@

 private import swift
 private import codeql.swift.controlflow.ControlFlowGraph
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import Completion
 private import Scope
 import ControlFlowGraphImplShared
--- a/swift/ql/lib/codeql/swift/controlflow/internal/Scope.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/Scope.qll
@@ -1,6 +1,6 @@
 private import swift
 private import codeql.swift.generated.GetImmediateParent
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa

 module CallableBase {
  class TypeRange = Ipa::TAbstractFunctionDecl or Ipa::TKeyPathExpr or Ipa::TClosureExpr;
--- a/swift/ql/lib/codeql/swift/generated/AstNode.qll
+++ b/swift/ql/lib/codeql/swift/generated/AstNode.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Locatable

--- a/swift/ql/lib/codeql/swift/generated/Callable.qll
+++ b/swift/ql/lib/codeql/swift/generated/Callable.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.stmt.BraceStmt
 import codeql.swift.elements.Element
--- a/swift/ql/lib/codeql/swift/generated/DbFile.qll
+++ b/swift/ql/lib/codeql/swift/generated/DbFile.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.File

--- a/swift/ql/lib/codeql/swift/generated/DbLocation.qll
+++ b/swift/ql/lib/codeql/swift/generated/DbLocation.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Location

--- a/swift/ql/lib/codeql/swift/generated/Element.qll
+++ b/swift/ql/lib/codeql/swift/generated/Element.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db

 class ElementBase extends Ipa::TElement {
--- a/swift/ql/lib/codeql/swift/generated/File.qll
+++ b/swift/ql/lib/codeql/swift/generated/File.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Element

--- a/swift/ql/lib/codeql/swift/generated/IpaTypes.qll
+++ b/swift/ql/lib/codeql/swift/generated/IpaTypes.qll
--- a/swift/ql/lib/codeql/swift/generated/Locatable.qll
+++ b/swift/ql/lib/codeql/swift/generated/Locatable.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Element
 import codeql.swift.elements.Location
--- a/swift/ql/lib/codeql/swift/generated/Location.qll
+++ b/swift/ql/lib/codeql/swift/generated/Location.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Element
 import codeql.swift.elements.File
--- a/swift/ql/lib/codeql/swift/generated/UnknownFile.qll
+++ b/swift/ql/lib/codeql/swift/generated/UnknownFile.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.File

--- a/swift/ql/lib/codeql/swift/generated/UnknownLocation.qll
+++ b/swift/ql/lib/codeql/swift/generated/UnknownLocation.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Location

--- a/swift/ql/lib/codeql/swift/generated/decl/AbstractFunctionDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AbstractFunctionDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Callable
 import codeql.swift.elements.decl.GenericContext
--- a/swift/ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.AccessorDecl
 import codeql.swift.elements.decl.ValueDecl
--- a/swift/ql/lib/codeql/swift/generated/decl/AbstractTypeParamDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AbstractTypeParamDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.TypeDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/AccessorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AccessorDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.FuncDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/AssociatedTypeDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/AssociatedTypeDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.AbstractTypeParamDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/ClassDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ClassDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.NominalTypeDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/ConcreteFuncDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ConcreteFuncDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.FuncDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/ConcreteVarDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ConcreteVarDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.VarDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/ConstructorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ConstructorDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.AbstractFunctionDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/Decl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/Decl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.AstNode

--- a/swift/ql/lib/codeql/swift/generated/decl/DestructorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/DestructorDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.AbstractFunctionDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/EnumCaseDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/EnumCaseDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.decl.EnumElementDecl
--- a/swift/ql/lib/codeql/swift/generated/decl/EnumDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/EnumDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.NominalTypeDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/EnumElementDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/EnumElementDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.ParamDecl
 import codeql.swift.elements.decl.ValueDecl
--- a/swift/ql/lib/codeql/swift/generated/decl/ExtensionDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ExtensionDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.decl.GenericContext
--- a/swift/ql/lib/codeql/swift/generated/decl/FuncDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/FuncDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.AbstractFunctionDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/GenericContext.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/GenericContext.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Element
 import codeql.swift.elements.decl.GenericTypeParamDecl
--- a/swift/ql/lib/codeql/swift/generated/decl/GenericTypeDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/GenericTypeDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.GenericContext
 import codeql.swift.elements.decl.TypeDecl
--- a/swift/ql/lib/codeql/swift/generated/decl/GenericTypeParamDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/GenericTypeParamDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.AbstractTypeParamDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/IfConfigClause.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/IfConfigClause.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.AstNode
 import codeql.swift.elements.expr.Expr
--- a/swift/ql/lib/codeql/swift/generated/decl/IfConfigDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/IfConfigDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.decl.IfConfigClause
--- a/swift/ql/lib/codeql/swift/generated/decl/ImportDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ImportDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.decl.ModuleDecl
--- a/swift/ql/lib/codeql/swift/generated/decl/InfixOperatorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/InfixOperatorDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.OperatorDecl
 import codeql.swift.elements.decl.PrecedenceGroupDecl
--- a/swift/ql/lib/codeql/swift/generated/decl/IterableDeclContext.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/IterableDeclContext.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.Element
--- a/swift/ql/lib/codeql/swift/generated/decl/MissingMemberDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/MissingMemberDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl

--- a/swift/ql/lib/codeql/swift/generated/decl/ModuleDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ModuleDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.TypeDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/NominalTypeDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/NominalTypeDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.GenericTypeDecl
 import codeql.swift.elements.decl.IterableDeclContext
--- a/swift/ql/lib/codeql/swift/generated/decl/OpaqueTypeDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/OpaqueTypeDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.GenericTypeDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/OperatorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/OperatorDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl

--- a/swift/ql/lib/codeql/swift/generated/decl/ParamDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ParamDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.VarDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/PatternBindingDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/PatternBindingDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.expr.Expr
--- a/swift/ql/lib/codeql/swift/generated/decl/PostfixOperatorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/PostfixOperatorDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.OperatorDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/PoundDiagnosticDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/PoundDiagnosticDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl

--- a/swift/ql/lib/codeql/swift/generated/decl/PrecedenceGroupDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/PrecedenceGroupDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl

--- a/swift/ql/lib/codeql/swift/generated/decl/PrefixOperatorDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/PrefixOperatorDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.OperatorDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/ProtocolDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ProtocolDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.NominalTypeDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/StructDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/StructDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.NominalTypeDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/SubscriptDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/SubscriptDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.AbstractStorageDecl
 import codeql.swift.elements.decl.GenericContext
--- a/swift/ql/lib/codeql/swift/generated/decl/TopLevelCodeDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/TopLevelCodeDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.stmt.BraceStmt
 import codeql.swift.elements.decl.Decl
--- a/swift/ql/lib/codeql/swift/generated/decl/TypeAliasDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/TypeAliasDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.GenericTypeDecl

--- a/swift/ql/lib/codeql/swift/generated/decl/TypeDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/TypeDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.type.Type
 import codeql.swift.elements.decl.ValueDecl
--- a/swift/ql/lib/codeql/swift/generated/decl/ValueDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ValueDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.type.Type
--- a/swift/ql/lib/codeql/swift/generated/decl/VarDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/VarDecl.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.AbstractStorageDecl
 import codeql.swift.elements.expr.Expr
--- a/swift/ql/lib/codeql/swift/generated/expr/AbstractClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AbstractClosureExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Callable
 import codeql.swift.elements.expr.Expr
--- a/swift/ql/lib/codeql/swift/generated/expr/AnyHashableErasureExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AnyHashableErasureExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/AnyTryExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AnyTryExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr

--- a/swift/ql/lib/codeql/swift/generated/expr/AppliedPropertyWrapperExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AppliedPropertyWrapperExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr

--- a/swift/ql/lib/codeql/swift/generated/expr/ApplyExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ApplyExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Argument
 import codeql.swift.elements.expr.Expr
--- a/swift/ql/lib/codeql/swift/generated/expr/ArchetypeToSuperExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ArchetypeToSuperExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/Argument.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/Argument.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr
 import codeql.swift.elements.Locatable
--- a/swift/ql/lib/codeql/swift/generated/expr/ArrayExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ArrayExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.CollectionExpr
 import codeql.swift.elements.expr.Expr
--- a/swift/ql/lib/codeql/swift/generated/expr/ArrayToPointerExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ArrayToPointerExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/ArrowExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ArrowExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr

--- a/swift/ql/lib/codeql/swift/generated/expr/AssignExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AssignExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr

--- a/swift/ql/lib/codeql/swift/generated/expr/AutoClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AutoClosureExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.AbstractClosureExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/AwaitExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/AwaitExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.IdentityExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/BinaryExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/BinaryExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ApplyExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/BindOptionalExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/BindOptionalExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr

--- a/swift/ql/lib/codeql/swift/generated/expr/BooleanLiteralExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/BooleanLiteralExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.BuiltinLiteralExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/BridgeFromObjCExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/BridgeFromObjCExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/BridgeToObjCExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/BridgeToObjCExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/BuiltinLiteralExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/BuiltinLiteralExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.LiteralExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/CallExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CallExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ApplyExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/CaptureListExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CaptureListExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ClosureExpr
 import codeql.swift.elements.expr.Expr
--- a/swift/ql/lib/codeql/swift/generated/expr/CheckedCastExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CheckedCastExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ExplicitCastExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/ClassMetatypeToObjectExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ClassMetatypeToObjectExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/ClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ClosureExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.AbstractClosureExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/CodeCompletionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CodeCompletionExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr

--- a/swift/ql/lib/codeql/swift/generated/expr/CoerceExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CoerceExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ExplicitCastExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/CollectionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CollectionExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr

--- a/swift/ql/lib/codeql/swift/generated/expr/CollectionUpcastConversionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CollectionUpcastConversionExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/ConditionalBridgeFromObjCExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ConditionalBridgeFromObjCExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/ConditionalCheckedCastExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ConditionalCheckedCastExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.CheckedCastExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/ConstructorRefCallExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/ConstructorRefCallExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.SelfApplyExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/CovariantFunctionConversionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CovariantFunctionConversionExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/CovariantReturnConversionExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/CovariantReturnConversionExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/DeclRefExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/DeclRefExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.expr.Expr
--- a/swift/ql/lib/codeql/swift/generated/expr/DefaultArgumentExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/DefaultArgumentExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.Expr
 import codeql.swift.elements.decl.ParamDecl
--- a/swift/ql/lib/codeql/swift/generated/expr/DerivedToBaseExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/DerivedToBaseExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/DestructureTupleExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/DestructureTupleExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.ImplicitConversionExpr

--- a/swift/ql/lib/codeql/swift/generated/expr/DictionaryExpr.qll
+++ b/swift/ql/lib/codeql/swift/generated/expr/DictionaryExpr.qll
@@ -1,5 +1,5 @@
 // generated by codegen/codegen.py
-private import codeql.swift.generated.IpaTypes
+private import codeql.swift.generated.Ipa
 private import codeql.swift.generated.Db
 import codeql.swift.elements.expr.CollectionExpr
 import codeql.swift.elements.expr.Expr
--- a/Show More
+++ b/Show More