Skip to content

Commit cac7262

Browse files
authored
Merge pull request #21831 from jketema/jketema/swift-declared-interface-type
Swift: Expose the declared interface type of a type decl
2 parents 974e7cc + 73a210a commit cac7262

24 files changed

Lines changed: 11689 additions & 34 deletions

File tree

swift/downgrades/1bb163e31d206f30146738adcd93def10fdabefa/old.dbscheme

Lines changed: 2892 additions & 0 deletions
Large diffs are not rendered by default.

swift/downgrades/1bb163e31d206f30146738adcd93def10fdabefa/swift.dbscheme

Lines changed: 2891 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: Expose declared interface types
2+
compatibility: full
3+
type_decls.rel: reorder type_decls.rel (@type_decl id, string name, @type_or_none declared_interface_type) id name

swift/extractor/translators/DeclTranslator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ void DeclTranslator::fillTypeDecl(const swift::TypeDecl& decl, codeql::TypeDecl&
299299
entry.inherited_types.push_back(dispatcher.fetchLabel(type));
300300
}
301301
}
302+
entry.declared_interface_type = dispatcher.fetchLabel(decl.getDeclaredInterfaceType());
302303
fillValueDecl(decl, entry);
303304
}
304305

swift/ql/.generated.list

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: feature
3+
---
4+
* The `TypeDecl` class now defines a `getDeclaredInterfaceType` predicate, which yields the declared interface type of the type declaration.

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

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swift/ql/lib/swift.dbscheme

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)