Merge pull request github#12520 from geoffw0/basetypefix

Swift: Fix result type of NominalType.getABaseType.

Author: geoffw0

swift/ql/lib/codeql/swift/elements/type/NominalType.qll

@@ -1,8 +1,9 @@
 private import codeql.swift.generated.type.NominalType
 private import codeql.swift.elements.decl.NominalTypeDecl
+private import codeql.swift.elements.type.Type
 
 class NominalType extends Generated::NominalType {
-  NominalType getABaseType() { result = this.getDeclaration().(NominalTypeDecl).getABaseType() }
+  Type getABaseType() { result = this.getDeclaration().(NominalTypeDecl).getABaseType() }
 
   NominalType getADerivedType() { result.getABaseType() = this }
 

swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected

@@ -2,12 +2,12 @@
 | nominaltype.swift:36:6:36:6 | a_alias | A_alias | A_alias |  |
 | nominaltype.swift:37:6:37:6 | a_optional_alias | A_optional_alias | A_optional_alias |  |
 | nominaltype.swift:38:6:38:6 | b1 | B1 | B1 | getABaseType:A |
-| nominaltype.swift:39:6:39:6 | b2 | B2 | B2 |  |
+| nominaltype.swift:39:6:39:6 | b2 | B2 | B2 | getABaseType:A_alias |
 | nominaltype.swift:40:6:40:6 | b1_alias | B1_alias | B1_alias |  |
 | nominaltype.swift:41:6:41:6 | b2_alias | B2_alias | B2_alias |  |
 | nominaltype.swift:42:6:42:6 | p | P | P |  |
 | nominaltype.swift:43:6:43:6 | p_alias | P_alias | P_alias |  |
 | nominaltype.swift:44:6:44:6 | c1 | C1 | C1 | getABaseType:P |
-| nominaltype.swift:45:6:45:6 | c2 | C2 | C2 |  |
+| nominaltype.swift:45:6:45:6 | c2 | C2 | C2 | getABaseType:P_alias |
 | nominaltype.swift:46:6:46:6 | c1_alias | C1_alias | C1_alias |  |
 | nominaltype.swift:47:6:47:6 | c2_alias | C2_alias | C2_alias |  |