Swift: cache equivalent of asDbInstance

Which is now a predicate in the `IpaTypes.qll` file (where `Cached`
was also renamed to `Ipa`).

Author: redsun82

swift/codegen/templates/ql_class.mustache

@@ -5,7 +5,7 @@ private import codeql.swift.generated.Db
 import {{.}}
 {{/imports}}
 
-class {{name}}Base extends Cached::T{{name}}{{#bases}}, {{.}}{{/bases}} {
+class {{name}}Base extends Ipa::T{{name}}{{#bases}}, {{.}}{{/bases}} {
   {{#root}}
   string toString() { none() } // overridden by subclasses
 
@@ -20,22 +20,16 @@ class {{name}}Base extends Cached::T{{name}}{{#bases}}, {{.}}{{/bases}} {
     or
     result = getResolveStep().resolve()
   }
-
-  Db::Element asDbInstance() { none() }
   {{/root}}
   {{#final}}
-  {{#has_db_id}}
-  final override Db::{{name}} asDbInstance() { this = Cached::T{{name}}(result) }
-  {{/has_db_id}}
-
   override string getAPrimaryQlClass() { result = "{{name}}" }
   {{/final}}
   {{#properties}}
 
   {{#type_is_class}}
   {{type}} getImmediate{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
     {{#has_db_id}}
-    result = Cached::fromDbInstance(asDbInstance().(Db::{{name}}).{{getter}}({{#is_repeated}}index{{/is_repeated}}))
+    result = Ipa::fromDbInstance(Ipa::toDbInstance(this).(Db::{{name}}).{{getter}}({{#is_repeated}}index{{/is_repeated}}))
     {{/has_db_id}}
     {{^has_db_id}}
     none()
@@ -50,7 +44,7 @@ class {{name}}Base extends Cached::T{{name}}{{#bases}}, {{.}}{{/bases}} {
   {{^type_is_class}}
   {{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
     {{#has_db_id}}
-    {{^is_predicate}}result = {{/is_predicate}}asDbInstance().(Db::{{name}}).{{getter}}({{#is_repeated}}index{{/is_repeated}})
+    {{^is_predicate}}result = {{/is_predicate}}Ipa::toDbInstance(this).(Db::{{name}}).{{getter}}({{#is_repeated}}index{{/is_repeated}})
     {{/has_db_id}}
     {{^has_db_id}}
     none()

swift/codegen/templates/ql_ipa_types.mustache

@@ -1,7 +1,7 @@
 private import codeql.swift.generated.IpaConstructors
 private import codeql.swift.generated.Db
 
-cached module Cached {
+cached module Ipa {
   cached newtype T{{root}} =
     {{#final_classes}}
     {{^first}}
@@ -31,4 +31,8 @@ cached module Cached {
     {{/is_ipa_on}}
     {{/final_classes}}
   }
+
+  cached Db::Element toDbInstance(TElement e) {
+    e = fromDbInstance(result)
+  }
 }

swift/ql/lib/codeql/swift/elements/UnknownLocation.qll

@@ -3,12 +3,13 @@ private import codeql.swift.elements.UnknownFile
 private import codeql.swift.elements.File
 
 class UnknownLocation extends UnknownLocationBase {
-  override File getImmediateFile() {
-    result instanceof UnknownFile
-  }
+  override File getImmediateFile() { result instanceof UnknownFile }
 
   override int getStartLine() { result = 0 }
+
   override int getStartColumn() { result = 0 }
+
   override int getEndLine() { result = 0 }
+
   override int getEndColumn() { result = 0 }
 }

swift/ql/lib/codeql/swift/generated/AstNode.qll

@@ -3,4 +3,4 @@ private import codeql.swift.generated.IpaTypes
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Locatable
 
-class AstNodeBase extends Cached::TAstNode, Locatable { }
+class AstNodeBase extends Ipa::TAstNode, Locatable { }

swift/ql/lib/codeql/swift/generated/Callable.qll

@@ -5,9 +5,9 @@ import codeql.swift.elements.stmt.BraceStmt
 import codeql.swift.elements.Element
 import codeql.swift.elements.decl.ParamDecl
 
-class CallableBase extends Cached::TCallable, Element {
+class CallableBase extends Ipa::TCallable, Element {
   ParamDecl getImmediateParam(int index) {
-    result = Cached::fromDbInstance(asDbInstance().(Db::Callable).getParam(index))
+    result = Ipa::fromDbInstance(Ipa::toDbInstance(this).(Db::Callable).getParam(index))
   }
 
   final ParamDecl getParam(int index) { result = getImmediateParam(index).resolve() }
@@ -17,7 +17,7 @@ class CallableBase extends Cached::TCallable, Element {
   final int getNumberOfParams() { result = count(getAParam()) }
 
   BraceStmt getImmediateBody() {
-    result = Cached::fromDbInstance(asDbInstance().(Db::Callable).getBody())
+    result = Ipa::fromDbInstance(Ipa::toDbInstance(this).(Db::Callable).getBody())
   }
 
   final BraceStmt getBody() { result = getImmediateBody().resolve() }

swift/ql/lib/codeql/swift/generated/DbFile.qll

@@ -3,8 +3,6 @@ private import codeql.swift.generated.IpaTypes
 private import codeql.swift.generated.Db
 import codeql.swift.elements.File
 
-class DbFileBase extends Cached::TDbFile, File {
-  final override Db::DbFile asDbInstance() { this = Cached::TDbFile(result) }
-
+class DbFileBase extends Ipa::TDbFile, File {
   override string getAPrimaryQlClass() { result = "DbFile" }
 }

swift/ql/lib/codeql/swift/generated/DbLocation.qll

@@ -3,8 +3,6 @@ private import codeql.swift.generated.IpaTypes
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Location
 
-class DbLocationBase extends Cached::TDbLocation, Location {
-  final override Db::DbLocation asDbInstance() { this = Cached::TDbLocation(result) }
-
+class DbLocationBase extends Ipa::TDbLocation, Location {
   override string getAPrimaryQlClass() { result = "DbLocation" }
 }

swift/ql/lib/codeql/swift/generated/Element.qll

@@ -2,7 +2,7 @@
 private import codeql.swift.generated.IpaTypes
 private import codeql.swift.generated.Db
 
-class ElementBase extends Cached::TElement {
+class ElementBase extends Ipa::TElement {
   string toString() { none() } // overridden by subclasses
 
   string getAPrimaryQlClass() { none() } // overridden by subclasses
@@ -17,7 +17,5 @@ class ElementBase extends Cached::TElement {
     result = getResolveStep().resolve()
   }
 
-  Db::Element asDbInstance() { none() }
-
-  predicate isUnknown() { asDbInstance().(Db::Element).isUnknown() }
+  predicate isUnknown() { Ipa::toDbInstance(this).(Db::Element).isUnknown() }
 }

swift/ql/lib/codeql/swift/generated/File.qll

@@ -3,6 +3,6 @@ private import codeql.swift.generated.IpaTypes
 private import codeql.swift.generated.Db
 import codeql.swift.elements.Element
 
-class FileBase extends Cached::TFile, Element {
-  string getName() { result = asDbInstance().(Db::File).getName() }
+class FileBase extends Ipa::TFile, Element {
+  string getName() { result = Ipa::toDbInstance(this).(Db::File).getName() }
 }

swift/ql/lib/codeql/swift/generated/IpaTypes.qll

@@ -2,7 +2,7 @@ private import codeql.swift.generated.IpaConstructors
 private import codeql.swift.generated.Db
 
 cached
-module Cached {
+module Ipa {
   cached
   newtype TElement =
     TDbFile(Db::DbFile id) or
@@ -865,4 +865,7 @@ module Cached {
     or
     result = TWeakStorageType(e)
   }
+
+  cached
+  Db::Element toDbInstance(TElement e) { e = fromDbInstance(result) }
 }