Merge pull request #9542 from github/alexdenisov/extract-extensions

Swift: extract extension declarations

Author: MathiasVP

swift/codegen/schema.yml

@@ -36,6 +36,7 @@ IterableDeclContext:
   members: Decl*
 
 ExtensionDecl:
+  extended_type_decl: NominalTypeDecl
   _extends:
     - GenericContext
     - IterableDeclContext

swift/extractor/visitors/DeclVisitor.h

@@ -193,6 +193,14 @@ class DeclVisitor : public AstVisitorBase<DeclVisitor> {
     emitAbstractStorageDecl(decl, label);
   }
 
+  void visitExtensionDecl(swift::ExtensionDecl* decl) {
+    auto label = dispatcher_.assignNewLabel(decl);
+    auto typeLabel = dispatcher_.fetchLabel(decl->getExtendedNominal());
+    dispatcher_.emit(ExtensionDeclsTrap{label, typeLabel});
+    emitGenericContext(decl, label);
+    emitIterableDeclContext(decl, label);
+  }
+
  private:
   void emitConstructorDecl(swift::ConstructorDecl* decl, TrapLabel<ConstructorDeclTag> label) {
     emitAbstractFunctionDecl(decl, label);

swift/ql/lib/codeql/swift/generated/decl/ExtensionDecl.qll

@@ -2,7 +2,15 @@
 import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.decl.GenericContext
 import codeql.swift.elements.decl.IterableDeclContext
+import codeql.swift.elements.decl.NominalTypeDecl
 
 class ExtensionDeclBase extends @extension_decl, Decl, GenericContext, IterableDeclContext {
   override string getAPrimaryQlClass() { result = "ExtensionDecl" }
+
+  NominalTypeDecl getExtendedTypeDecl() {
+    exists(NominalTypeDecl x |
+      extension_decls(this, x) and
+      result = x.resolve()
+    )
+  }
 }

swift/ql/lib/swift.dbscheme

@@ -98,7 +98,8 @@ iterable_decl_context_members(
 );
 
 extension_decls(
-  unique int id: @extension_decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl ref
 );
 
 @nominal_type_decl =

swift/ql/test/extractor-tests/declarations/all.expected

@@ -205,3 +205,7 @@
 | declarations.swift:132:5:132:5 | newValue |
 | declarations.swift:132:5:132:15 | willSet |
 | declarations.swift:134:5:134:14 | didSet |
+| declarations.swift:138:1:142:1 | extension |
+| declarations.swift:139:3:141:3 | id |
+| declarations.swift:139:8:139:8 | self |
+| declarations.swift:144:1:144:7 | { ... } |

swift/ql/test/extractor-tests/declarations/declarations.swift

@@ -133,4 +133,13 @@ struct HasPropertyAndObserver {
 
     didSet { }
   }
-}
+}
+
+extension Int {
+  func id() -> Int {
+    return self
+  }
+}
+
+42.id()
+

swift/ql/test/extractor-tests/declarations/func.expected

@@ -55,3 +55,4 @@
 | declarations.swift:131:7:131:7 | set | (unnamed function decl) |
 | declarations.swift:132:5:132:15 | willSet | (unnamed function decl) |
 | declarations.swift:134:5:134:14 | didSet | (unnamed function decl) |
+| declarations.swift:139:3:141:3 | id | id |

swift/ql/test/extractor-tests/declarations/func_body.expected

@@ -50,3 +50,4 @@
 | declarations.swift:131:7:131:7 | set | declarations.swift:131:7:131:7 | { ... } |
 | declarations.swift:132:5:132:15 | willSet | declarations.swift:132:13:132:15 | { ... } |
 | declarations.swift:134:5:134:14 | didSet | declarations.swift:134:12:134:14 | { ... } |
+| declarations.swift:139:3:141:3 | id | declarations.swift:139:20:141:3 | { ... } |

swift/ql/test/library-tests/parent/declarations.swift

@@ -133,4 +133,13 @@ struct HasPropertyAndObserver {
 
     didSet { }
   }
-}
+}
+
+extension Int {
+  func id() -> Int {
+    return self
+  }
+}
+
+42.id()
+

swift/ql/test/library-tests/parent/parent.expected

@@ -326,6 +326,13 @@
 | declarations.swift:132:5:132:15 | willSet | AccessorDecl | declarations.swift:132:5:132:5 | newValue | ParamDecl |
 | declarations.swift:132:5:132:15 | willSet | AccessorDecl | declarations.swift:132:13:132:15 | { ... } | BraceStmt |
 | declarations.swift:134:5:134:14 | didSet | AccessorDecl | declarations.swift:134:12:134:14 | { ... } | BraceStmt |
+| declarations.swift:139:3:141:3 | id | ConcreteFuncDecl | declarations.swift:139:20:141:3 | { ... } | BraceStmt |
+| declarations.swift:139:20:141:3 | { ... } | BraceStmt | declarations.swift:140:5:140:12 | return ... | ReturnStmt |
+| declarations.swift:140:5:140:12 | return ... | ReturnStmt | declarations.swift:140:12:140:12 | self | DeclRefExpr |
+| declarations.swift:144:1:144:4 | call to id | DotSyntaxCallExpr | declarations.swift:144:4:144:4 | id | DeclRefExpr |
+| declarations.swift:144:1:144:7 | call to ... | CallExpr | declarations.swift:144:1:144:4 | call to id | DotSyntaxCallExpr |
+| declarations.swift:144:1:144:7 | { ... } | BraceStmt | declarations.swift:144:1:144:7 | call to ... | CallExpr |
+| declarations.swift:144:1:144:7 | { ... } | TopLevelCodeDecl | declarations.swift:144:1:144:7 | { ... } | BraceStmt |
 | expressions.swift:1:1:1:9 | var ... = ... | PatternBindingDecl | expressions.swift:1:5:1:5 | a | NamedPattern |
 | expressions.swift:1:1:1:9 | var ... = ... | PatternBindingDecl | expressions.swift:1:9:1:9 | 15 | IntegerLiteralExpr |
 | expressions.swift:1:1:1:9 | { ... } | BraceStmt | expressions.swift:1:1:1:9 | var ... = ... | PatternBindingDecl |