Skip to content

Commit 2ee8d1a

Browse files
committed
Swift: implement optional ImportDecl:imported_module
1 parent 7873f07 commit 2ee8d1a

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

swift/extractor/visitors/DeclVisitor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ codeql::ExtensionDecl DeclVisitor::translateExtensionDecl(const swift::Extension
253253
codeql::ImportDecl DeclVisitor::translateImportDecl(const swift::ImportDecl& decl) {
254254
auto entry = createEntry(decl);
255255
entry.is_exported = decl.isExported();
256-
entry.imported_module = dispatcher_.fetchLabel(decl.getModule());
256+
entry.imported_module = dispatcher_.fetchOptionalLabel(decl.getModule());
257257
entry.declarations = dispatcher_.fetchRepeatedLabels(decl.getDecls());
258258
return entry;
259259
}
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
| import.swift:1:1:1:8 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no | getImportedModule: | file://:0:0:0:0 | Swift |
2-
| import.swift:2:1:2:24 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no | getImportedModule: | file://:0:0:0:0 | Swift |
3-
| import.swift:3:12:3:32 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | yes | getImportedModule: | file://:0:0:0:0 | Swift |
4-
| import.swift:4:1:4:19 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no | getImportedModule: | file://:0:0:0:0 | Swift |
5-
| import.swift:5:1:5:23 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no | getImportedModule: | file://:0:0:0:0 | Swift |
1+
| import.swift:1:1:1:8 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no |
2+
| import.swift:2:1:2:24 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no |
3+
| import.swift:3:12:3:32 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | yes |
4+
| import.swift:4:1:4:19 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no |
5+
| import.swift:5:1:5:23 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no |
6+
| import.swift:7:1:7:8 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no |
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
| import.swift:1:1:1:8 | import ... | file://:0:0:0:0 | Swift |
2+
| import.swift:2:1:2:24 | import ... | file://:0:0:0:0 | Swift |
3+
| import.swift:3:12:3:32 | import ... | file://:0:0:0:0 | Swift |
4+
| import.swift:4:1:4:19 | import ... | file://:0:0:0:0 | Swift |
5+
| import.swift:5:1:5:23 | import ... | file://:0:0:0:0 | Swift |

swift/ql/test/extractor-tests/generated/decl/ImportDecl/import.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ import typealias Swift.Int
33
@_exported import struct Swift.Double
44
import func Swift.print // imports all overloads
55
import protocol Swift.Hashable
6+
#if foo
7+
import Foo
8+
#endif

0 commit comments

Comments
 (0)