wip

Author: hvitved

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

@@ -99,7 +99,8 @@ predicate isStaticMember(Member member) {
   exists(ClassLikeDeclaration cls | cls.getAMember() = member |
     not any(NameBindingPlugin p).isInstanceMember(cls, member) or
     member instanceof ConstructorDeclaration or
-    member instanceof TypeAliasDeclaration
+    member instanceof TypeAliasDeclaration or
+    member instanceof ClassLikeDeclaration
   )
   or
   member = any(TopLevel t).getBody().getAStmt()

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

@@ -101,6 +101,12 @@ abstract private class TypeImpl extends TType {
     )
   }
 
+  /** Gets the parent type of this nested type, if any. */
+  ClassLikeDeclarationType getParentType() {
+    result.getClassLikeDeclaration() =
+      this.getATypeParameter().(ParentTypeParameterType).getParent()
+  }
+
   /** Gets the name node of this type, if any. */
   abstract Identifier getNameNode();
 

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

@@ -2,7 +2,6 @@
 
 /*
  * Known limitations:
- * - Implicit constructors in classes and structs are not generated by the extractor
  * - Pattern matching, including enum destructuring
  * - Inferred qualifiers `.foo`
  * - Type parameter bounds (`foo<T : Protocol>(x : T)`)
@@ -15,7 +14,6 @@
  * - Overloading (both arity based and type based)
  * - Indexing expressions
  * - Operations
- * - Inherited constructors
  * - Closure short-hand parameters `$0`, `$1`, etc (extractor change?)
  */
 
@@ -851,8 +849,9 @@ module Input3 implements InputSig3 {
     // `Optional.none` has an unknown `Wrapper` type
     exists(EnumField_ f, TypeParameter tp |
       n.(FieldAccess).getField() = f and
-      tp = f.getType().getType().getATypeParameter() and
-      path = TypePath::singleton(tp) and
+      tp = f.getType().getType().getParentType*().getATypeParameter() and
+      not tp instanceof ParentTypeParameterType and
+      tp = f.getType().getTypeAt(path) and
       // `Optional<String>.none` does not have an unknown `Wrapper` type
       not exists(n.(MemberAccessExpr).getBase().(TypeMention).getTypeAt(path))
     ) and

unified/ql/test/library-tests/type-inference/nested_types.swift

@@ -114,8 +114,12 @@ class Outer<TOuter> {
         let c = p2.0.getOuter()  // $ target=Outer.Inner.getOuter field=Tuple2.0 type=c:Bool
         let d = p2.0.getInner()  // $ target=Outer.Inner.getInner field=Tuple2.0 type=d:Int
     }
+
+    enum E { case empty }
 }
 
+let e: Outer<Int>.E = Outer.E.empty  // $ field=Outer.E.empty type=.empty@Outer.E<(parent:E)>.Outer<TOuter>:Int
+
 class Foo: Outer<String> {
     func f(x: Pair, y: Outer<Bool>.Pair) {
         var a = x.0.getInner()  // $ target=Outer.Inner.getInner field=Tuple2.0 type=a:Int