Skip to content

Commit dc299fc

Browse files
authored
Merge pull request github#14208 from github/redsun82/swift-unordered-base-types
Swift: rename `base_types` in `TypeDecl` to `inherited_types`
2 parents c4d7302 + 168aca0 commit dc299fc

35 files changed

+10596
-74
lines changed

swift/downgrades/f5a22f5168adfd7f308b5941c11852c925edd638/old.dbscheme

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

swift/downgrades/f5a22f5168adfd7f308b5941c11852c925edd638/swift.dbscheme

Lines changed: 2618 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
description: Undo rename `base_types` to `inherited_types` in `@type_decl
2+
compatibility: full
3+
type_decl_base_types.rel: reorder type_decl_inherited_types(int id, int index, int type) id index type
4+
type_decl_inherited_types.rel: delete

swift/extractor/translators/DeclTranslator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ void DeclTranslator::fillTypeDecl(const swift::TypeDecl& decl, codeql::TypeDecl&
271271
entry.name = decl.getNameStr().str();
272272
for (auto& typeLoc : decl.getInherited()) {
273273
if (auto type = typeLoc.getType()) {
274-
entry.base_types.push_back(dispatcher.fetchLabel(type));
274+
entry.inherited_types.push_back(dispatcher.fetchLabel(type));
275275
}
276276
}
277277
fillValueDecl(decl, entry);

swift/ql/.generated.list

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

swift/ql/.gitattributes

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
5+
* Renamed `TypeDecl.getBaseType/1` to `getInheritedType`.

0 commit comments

Comments
 (0)