Address review comments

Author: hvitved

unified/ql/lib/codeql/unified/internal/FacadeAst.qll

@@ -40,8 +40,6 @@ module Unified {
 
     /**
      * Gets the nearest syntactically enclosing class declaration, if any.
-     *
-     * For the semantically enclosing class, use `getParentClass()` instead.
      */
     ClassLikeDeclaration getEnclosingClass() {
       exists(AstNode parent | parent = this.getParent() |
@@ -52,33 +50,6 @@ module Unified {
       )
     }
 
-    /**
-     * Gets the class that this node belongs to, if any.
-     *
-     * Unlike `getEnclosingClass`, this takes extensions into account:
-     *
-     * ```swift
-     * class A {
-     *   let x : Int // belongs to class A
-     * }
-     *
-     * extension A {
-     *   func foo() {} // also belongs to the class A
-     * }
-     * ```
-     */
-    ClassLikeDeclaration getParentClass() {
-      exists(ClassLikeDeclaration encl | encl = this.getEnclosingClass() |
-        not exists(encl.getExtensionTarget()) and
-        result = encl
-        or
-        exists(NameBinding::NamespaceNode ns |
-          ns.isStaticMemberNamespace(result) and
-          ns.getAnExtension().isStaticMemberNamespace(encl)
-        )
-      )
-    }
-
     private AstNode overrideEnclosingCallableParent() {
       exists(FunctionExpr func |
         // Capture declarations are evaluated as part of the outer context, and
@@ -244,13 +215,10 @@ module Unified {
 
   private module QualifiedName<getDeclaringClassSig/1 getDeclaringClass> {
     string getQualifiedName(Member m) {
-      not m instanceof U::EnumCaseConstructor and
       result = getQualifiedName(getDeclaringClass(m)) + "." + m.getNameOrFallback()
       or
       not exists(getDeclaringClass(m)) and
       result = m.getNameOrFallback()
-      or
-      result = getQualifiedName(m.(U::EnumCaseConstructor).getEnumCaseClass())
     }
   }
 
@@ -277,17 +245,27 @@ module Unified {
         NameBinding::getStaticBindingTargetFromRef(this.getABaseType().getType())
     }
 
+    /**
+     * Gets the class that this class resolves to. Either itself, when it
+     * is not extension, otherwise the class that it extends.
+     */
+    ClassLikeDeclaration resolve() {
+      not exists(this.getExtensionTarget()) and
+      result = this
+      or
+      exists(NameBinding::NamespaceNode ns |
+        ns.isStaticMemberNamespace(result) and
+        ns.getAnExtension().isStaticMemberNamespace(this)
+      )
+    }
+
     /**
      * Gets a member of this class, including members from extensions.
      */
     Member getAMemberIncludingExtensions() {
-      result = this.getAMember() and
-      not exists(this.getExtensionTarget())
-      or
-      exists(ClassLikeDeclaration ext, NameBinding::NamespaceNode ns |
-        ns.isStaticMemberNamespace(this) and
-        ns.getAnExtension().isStaticMemberNamespace(ext) and
-        result = ext.getAMember()
+      exists(ClassLikeDeclaration cls |
+        this = cls.resolve() and
+        result = cls.getAMember()
       )
     }
 

unified/ql/lib/codeql/unified/internal/typeinference/TypeInference.qll

@@ -784,7 +784,7 @@ module Input3 implements InputSig3 {
     path.isEmpty()
     or
     exists(ClassLikeDeclaration c |
-      c = n.(SuperExpr).getParentClass() and
+      c = n.(SuperExpr).getEnclosingClass().resolve() and
       result = c.getBaseType(0).getType().(TypeMention).getTypeAt(path)
     )
     or

unified/ql/lib/utils/test/TestUtils.qll

@@ -48,6 +48,11 @@ predicate callableName(Callable c, string alias) {
     keyValueCommentAt(filepath, line, "name", alias)
     or
     not keyValueCommentAt(filepath, line, "name", _) and
-    alias = c.(Member).getQualifiedName()
+    (
+      not c instanceof EnumCaseConstructor and
+      alias = c.(Member).getQualifiedName()
+      or
+      alias = c.(EnumCaseConstructor).getEnumCaseClass().getQualifiedName()
+    )
   )
 }

unified/ql/test/library-tests/controlflow/basicblock-slices.expected

@@ -7,7 +7,7 @@
 | 8 | cfg.swift:8:1:8:6 | Double | 'Double -> Argument -V topLevelDecl -^ Double(...)' |
 | 10 | cfg.swift:10:1:13:1 | enum MyError | 'enum MyError -V MyError -> BaseType -V Error' |
 | 11 | cfg.swift:11:10:11:15 | MyError.error1 | 'MyError.error1 -V error1 -> MyError.error2 -V error2' |
-| 12 | cfg.swift:12:10:12:31 | MyError.error3 | 'MyError.error3 -V error3 -^ MyError.error3' |
+| 12 | cfg.swift:12:10:12:31 | MyError.error3 | 'MyError.error3 -V error3 -^ MyError.error3.(constructor)' |
 | 12 | cfg.swift:12:17:12:25 | withParam | 'withParam -? Block' |
 | 15 | cfg.swift:15:1:17:1 | func isZero | 'func isZero -V isZero' |
 | 15 | cfg.swift:15:13:15:13 | x | 'x -> Block' |