Swift: group unresolved elements and remove their tests

Author: redsun82

swift/codegen/schema.yml

@@ -17,6 +17,9 @@ Element:
     _pragma: cpp_skip  # this is emitted using trap entries directly
   _pragma: qltest_skip
 
+UnresolvedElement:
+  _pragma: [ qltest_collapse_hierarchy, qltest_skip ]
+
 File:
   name: string
   _pragma: qltest_collapse_hierarchy
@@ -27,7 +30,7 @@ DbFile:
 UnknownFile:
   _extends: File
   _synth:
-    on: {}
+    on: { }
 
 Locatable:
   location:
@@ -41,15 +44,15 @@ Location:
   start_column: int
   end_line: int
   end_column: int
-  _pragma: [qltest_skip, qltest_collapse_hierarchy]
+  _pragma: [ qltest_skip, qltest_collapse_hierarchy ]
 
 DbLocation:
   _extends: Location
 
 UnknownLocation:
   _extends: Location
   _synth:
-    on: {}
+    on: { }
 
 Comment:
   _extends: Locatable
@@ -179,7 +182,9 @@ TypeVariableType:
   _extends: Type
 
 UnresolvedType:
-  _extends: Type
+  _extends:
+    - Type
+    - UnresolvedElement
 
 ClassDecl:
   _extends: NominalTypeDecl
@@ -573,28 +578,36 @@ TypeExpr:
     type_repr: TypeRepr?
 
 UnresolvedDeclRefExpr:
-  _extends: Expr
+  _extends:
+    - Expr
+    - UnresolvedElement
   name: string?
 
 UnresolvedDotExpr:
-  _extends: Expr
+  _extends:
+    - Expr
+    - UnresolvedElement
   _children:
     base: Expr
   name: string
 
 UnresolvedMemberExpr:
-  _extends: Expr
+  _extends:
+    - Expr
+    - UnresolvedElement
   name: string
-  _pragma: qltest_skip  # we should really never extract these
 
 UnresolvedPatternExpr:
-  _extends: Expr
+  _extends:
+    - Expr
+    - UnresolvedElement
   _children:
     sub_pattern: Pattern
 
 UnresolvedSpecializeExpr:
-  _extends: Expr
-  _pragma: qltest_skip  # we should really never extract these
+  _extends:
+    - Expr
+    - UnresolvedElement
 
 VarargExpansionExpr:
   _extends: Expr
@@ -856,7 +869,9 @@ ParenExpr:
   _extends: IdentityExpr
 
 UnresolvedMemberChainResultExpr:
-  _extends: IdentityExpr
+  _extends:
+    - IdentityExpr
+    - UnresolvedElement
 
 AnyHashableErasureExpr:
   _extends: ImplicitConversionExpr
@@ -952,7 +967,9 @@ UnevaluatedInstanceExpr:
   _extends: ImplicitConversionExpr
 
 UnresolvedTypeConversionExpr:
-  _extends: ImplicitConversionExpr
+  _extends:
+    - ImplicitConversionExpr
+    - UnresolvedElement
 
 BuiltinLiteralExpr:
   _extends: LiteralExpr

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

@@ -10,6 +10,7 @@ import codeql.swift.elements.Locatable
 import codeql.swift.elements.Location
 import codeql.swift.elements.UnknownFile
 import codeql.swift.elements.UnknownLocation
+import codeql.swift.elements.UnresolvedElement
 import codeql.swift.elements.decl.AbstractFunctionDecl
 import codeql.swift.elements.decl.AbstractStorageDecl
 import codeql.swift.elements.decl.AbstractTypeParamDecl

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

@@ -0,0 +1,4 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+private import codeql.swift.generated.UnresolvedElement
+
+class UnresolvedElement extends UnresolvedElementBase { }

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

@@ -120,6 +120,21 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfUnresolvedElement(
+    UnresolvedElement e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bElement, int n |
+      b = 0 and
+      bElement = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfElement(e, i, _)) | i) and
+      n = bElement and
+      (
+        none()
+        or
+        result = getImmediateChildOfElement(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
   private Element getImmediateChildOfAnyFunctionType(
     AnyFunctionType e, int index, string partialPredicateCall
   ) {
@@ -563,14 +578,18 @@ private module Impl {
   private Element getImmediateChildOfUnresolvedType(
     UnresolvedType e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bType, int n |
+    exists(int b, int bType, int bUnresolvedElement, int n |
       b = 0 and
       bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
-      n = bType and
+      bUnresolvedElement =
+        bType + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnresolvedElement(e, i, _)) | i) and
+      n = bUnresolvedElement and
       (
         none()
         or
         result = getImmediateChildOfType(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfUnresolvedElement(e, index - bType, partialPredicateCall)
       )
     )
   }
@@ -2630,31 +2649,39 @@ private module Impl {
   private Element getImmediateChildOfUnresolvedDeclRefExpr(
     UnresolvedDeclRefExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n |
+    exists(int b, int bExpr, int bUnresolvedElement, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
+      bUnresolvedElement =
+        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnresolvedElement(e, i, _)) | i) and
+      n = bUnresolvedElement and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfUnresolvedElement(e, index - bExpr, partialPredicateCall)
       )
     )
   }
 
   private Element getImmediateChildOfUnresolvedDotExpr(
     UnresolvedDotExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nBase |
+    exists(int b, int bExpr, int bUnresolvedElement, int n, int nBase |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
+      bUnresolvedElement =
+        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnresolvedElement(e, i, _)) | i) and
+      n = bUnresolvedElement and
       nBase = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
+        result = getImmediateChildOfUnresolvedElement(e, index - bExpr, partialPredicateCall)
+        or
         index = n and result = e.getImmediateBase() and partialPredicateCall = "Base()"
       )
     )
@@ -2663,31 +2690,39 @@ private module Impl {
   private Element getImmediateChildOfUnresolvedMemberExpr(
     UnresolvedMemberExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n |
+    exists(int b, int bExpr, int bUnresolvedElement, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
+      bUnresolvedElement =
+        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnresolvedElement(e, i, _)) | i) and
+      n = bUnresolvedElement and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfUnresolvedElement(e, index - bExpr, partialPredicateCall)
       )
     )
   }
 
   private Element getImmediateChildOfUnresolvedPatternExpr(
     UnresolvedPatternExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nSubPattern |
+    exists(int b, int bExpr, int bUnresolvedElement, int n, int nSubPattern |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
+      bUnresolvedElement =
+        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnresolvedElement(e, i, _)) | i) and
+      n = bUnresolvedElement and
       nSubPattern = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
         or
+        result = getImmediateChildOfUnresolvedElement(e, index - bExpr, partialPredicateCall)
+        or
         index = n and result = e.getImmediateSubPattern() and partialPredicateCall = "SubPattern()"
       )
     )
@@ -2696,14 +2731,18 @@ private module Impl {
   private Element getImmediateChildOfUnresolvedSpecializeExpr(
     UnresolvedSpecializeExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n |
+    exists(int b, int bExpr, int bUnresolvedElement, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
+      bUnresolvedElement =
+        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnresolvedElement(e, i, _)) | i) and
+      n = bUnresolvedElement and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfUnresolvedElement(e, index - bExpr, partialPredicateCall)
       )
     )
   }
@@ -4104,32 +4143,45 @@ private module Impl {
   private Element getImmediateChildOfUnresolvedMemberChainResultExpr(
     UnresolvedMemberChainResultExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bIdentityExpr, int n |
+    exists(int b, int bIdentityExpr, int bUnresolvedElement, int n |
       b = 0 and
       bIdentityExpr =
         b + 1 + max(int i | i = -1 or exists(getImmediateChildOfIdentityExpr(e, i, _)) | i) and
-      n = bIdentityExpr and
+      bUnresolvedElement =
+        bIdentityExpr + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfUnresolvedElement(e, i, _)) | i) and
+      n = bUnresolvedElement and
       (
         none()
         or
         result = getImmediateChildOfIdentityExpr(e, index - b, partialPredicateCall)
+        or
+        result =
+          getImmediateChildOfUnresolvedElement(e, index - bIdentityExpr, partialPredicateCall)
       )
     )
   }
 
   private Element getImmediateChildOfUnresolvedTypeConversionExpr(
     UnresolvedTypeConversionExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bImplicitConversionExpr, int n |
+    exists(int b, int bImplicitConversionExpr, int bUnresolvedElement, int n |
       b = 0 and
       bImplicitConversionExpr =
         b + 1 +
           max(int i | i = -1 or exists(getImmediateChildOfImplicitConversionExpr(e, i, _)) | i) and
-      n = bImplicitConversionExpr and
+      bUnresolvedElement =
+        bImplicitConversionExpr + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfUnresolvedElement(e, i, _)) | i) and
+      n = bUnresolvedElement and
       (
         none()
         or
         result = getImmediateChildOfImplicitConversionExpr(e, index - b, partialPredicateCall)
+        or
+        result =
+          getImmediateChildOfUnresolvedElement(e, index - bImplicitConversionExpr,
+            partialPredicateCall)
       )
     )
   }