Skip to content

Commit 2ef8bb0

Browse files
jketemajketema
committed
Swift: Make extractor compile with Swift 6.2
1 parent d11b445 commit 2ef8bb0

14 files changed

Lines changed: 40 additions & 58 deletions

‎swift/extractor/SwiftExtractor.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ static std::unordered_set<swift::ModuleDecl*> extractDeclarations(
170170
bodyEmissionStrategy);
171171
auto topLevelDecls = getTopLevelDecls(module, primaryFile, lazyDeclaration);
172172
for (auto decl : topLevelDecls) {
173-
if (swift::AvailableAttr::isUnavailable(decl)) {
174-
continue;
175-
}
173+
// TODO: Swift 6.2 is unavailable
176174
visitor.extract(decl);
177175
}
178176
for (auto& comment : comments) {

‎swift/extractor/infra/SwiftTagTraits.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@ MAP(swift::Expr, ExprTag)
102102
MAP(swift::IdentityExpr, IdentityExprTag)
103103
MAP(swift::ParenExpr, ParenExprTag)
104104
MAP(swift::DotSelfExpr, DotSelfExprTag)
105-
MAP(swift::BorrowExpr, BorrowExprTag)
106105
MAP(swift::AwaitExpr, AwaitExprTag)
106+
MAP(swift::UnsafeExpr, void) // TODO: Swift 6.2
107+
MAP(swift::BorrowExpr, BorrowExprTag)
107108
MAP(swift::UnresolvedMemberChainResultExpr, UnresolvedMemberChainResultExprTag)
108109
MAP(swift::AnyTryExpr, AnyTryExprTag)
109110
MAP(swift::TryExpr, TryExprTag)
@@ -195,7 +196,6 @@ MAP(swift::Expr, ExprTag)
195196
MAP(swift::ObjCSelectorExpr, ObjCSelectorExprTag)
196197
MAP(swift::KeyPathExpr, KeyPathExprTag)
197198
MAP(swift::KeyPathDotExpr, KeyPathDotExprTag)
198-
MAP(swift::OneWayExpr, OneWayExprTag)
199199
MAP(swift::TapExpr, TapExprTag)
200200
MAP(swift::TypeJoinExpr, void) // does not appear in a visible AST, skipping
201201
MAP(swift::MacroExpansionExpr, void) // unexpanded macro in an expr context, skipping
@@ -237,11 +237,11 @@ MAP(swift::Decl, DeclTag)
237237
MAP(swift::ExtensionDecl, ExtensionDeclTag)
238238
MAP(swift::TopLevelCodeDecl, TopLevelCodeDeclTag)
239239
MAP(swift::ImportDecl, ImportDeclTag)
240-
MAP(swift::PoundDiagnosticDecl, PoundDiagnosticDeclTag)
241240
MAP(swift::PrecedenceGroupDecl, PrecedenceGroupDeclTag)
242241
MAP(swift::MissingMemberDecl, MissingMemberDeclTag)
243242
MAP(swift::PatternBindingDecl, PatternBindingDeclTag)
244243
MAP(swift::EnumCaseDecl, EnumCaseDeclTag)
244+
MAP(swift::UsingDecl, void) // TODO: Swift 6.2
245245
MAP(swift::OperatorDecl, OperatorDeclTag)
246246
MAP(swift::InfixOperatorDecl, InfixOperatorDeclTag)
247247
MAP(swift::PrefixOperatorDecl, PrefixOperatorDeclTag)
@@ -315,7 +315,7 @@ MAP(swift::TypeBase, TypeTag)
315315
MAP(swift::PrimaryArchetypeType, PrimaryArchetypeTypeTag)
316316
MAP(swift::OpaqueTypeArchetypeType, OpaqueTypeArchetypeTypeTag)
317317
MAP(swift::LocalArchetypeType, LocalArchetypeTypeTag)
318-
MAP(swift::OpenedArchetypeType, OpenedArchetypeTypeTag)
318+
MAP(swift::ExistentialArchetypeType, ExistentialArchetypeTypeTag)
319319
MAP(swift::ElementArchetypeType, ElementArchetypeTypeTag)
320320
MAP(swift::PackArchetypeType, PackArchetypeTypeTag)
321321
MAP(swift::GenericTypeParamType, GenericTypeParamTypeTag)
@@ -342,16 +342,16 @@ MAP(swift::TypeBase, TypeTag)
342342
MAP(swift::IntegerType, IntegerTypeTag)
343343
MAP(swift::SugarType, SugarTypeTag)
344344
MAP(swift::TypeAliasType, TypeAliasTypeTag)
345+
MAP(swift::LocatableType, void) // TODO: Swift 6.2
345346
MAP(swift::SyntaxSugarType, SyntaxSugarTypeTag)
346347
MAP(swift::UnarySyntaxSugarType, UnarySyntaxSugarTypeTag)
347348
MAP(swift::ArraySliceType, ArraySliceTypeTag)
348349
MAP(swift::OptionalType, OptionalTypeTag)
349350
MAP(swift::VariadicSequenceType, VariadicSequenceTypeTag)
351+
MAP(swift::InlineArrayType, void) // TODO: Swift 6.2
350352
MAP(swift::DictionaryType, DictionaryTypeTag)
351353

352354
MAP(swift::AvailabilitySpec, AvailabilitySpecTag)
353-
MAP(swift::PlatformVersionConstraintAvailabilitySpec, PlatformVersionAvailabilitySpecTag)
354-
MAP(swift::OtherPlatformAvailabilitySpec, OtherAvailabilitySpecTag)
355355

356356
MAP(swift::PoundAvailableInfo, AvailabilityInfoTag)
357357
MAP(swift::MacroRoleAttr, MacroRoleTag)

‎swift/extractor/mangler/SwiftMangler.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ SwiftMangledName SwiftMangler::visitAnyFunctionType(const swift::AnyFunctionType
215215
if (flags.isSending()) {
216216
ret << "_sending";
217217
}
218-
if (flags.isCompileTimeConst()) {
219-
ret << "_compiletimeconst";
218+
if (flags.isCompileTimeLiteral()) {
219+
ret << "_compiletimeliteral";
220220
}
221221
if (flags.isNoDerivative()) {
222222
ret << "_noderivative";
@@ -361,7 +361,8 @@ SwiftMangledName SwiftMangler::visitOpaqueTypeArchetypeType(
361361
return visitArchetypeType(type) << fetch(type->getDecl());
362362
}
363363

364-
SwiftMangledName SwiftMangler::visitOpenedArchetypeType(const swift::OpenedArchetypeType* type) {
364+
SwiftMangledName SwiftMangler::visitExistentialArchetypeType(
365+
const swift::ExistentialArchetypeType* type) {
365366
auto* env = type->getGenericEnvironment();
366367
llvm::SmallVector<char> uuid;
367368
env->getOpenedExistentialUUID().toString(uuid);

‎swift/extractor/mangler/SwiftMangler.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
9393
SwiftMangledName visitTypeAliasType(const swift::TypeAliasType* type);
9494
SwiftMangledName visitArchetypeType(const swift::ArchetypeType* type);
9595
SwiftMangledName visitOpaqueTypeArchetypeType(const swift::OpaqueTypeArchetypeType* type);
96-
SwiftMangledName visitOpenedArchetypeType(const swift::OpenedArchetypeType* type);
96+
SwiftMangledName visitExistentialArchetypeType(const swift::ExistentialArchetypeType* type);
9797
SwiftMangledName visitProtocolCompositionType(const swift::ProtocolCompositionType* type);
9898
SwiftMangledName visitLValueType(const swift::LValueType* type);
9999
SwiftMangledName visitDynamicSelfType(const swift::DynamicSelfType* type);

‎swift/extractor/translators/DeclTranslator.cpp‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,18 @@ codeql::Accessor DeclTranslator::translateAccessorDecl(const swift::AccessorDecl
197197
case swift::AccessorKind::MutableAddress:
198198
entry.is_unsafe_mutable_address = true;
199199
break;
200+
case swift::AccessorKind::DistributedGet:
201+
// TODO: Swift 6.2
202+
break;
203+
case swift::AccessorKind::Read2:
204+
// TODO: Swift 6.2
205+
break;
206+
case swift::AccessorKind::Modify2:
207+
// TODO: Swift 6.2
208+
break;
209+
case swift::AccessorKind::Init:
210+
// TODO: Swift 6.2
211+
break;
200212
}
201213
fillFunction(decl, entry);
202214
return entry;
@@ -280,9 +292,7 @@ void DeclTranslator::fillTypeDecl(const swift::TypeDecl& decl, codeql::TypeDecl&
280292
void DeclTranslator::fillIterableDeclContext(const swift::IterableDeclContext& decl,
281293
codeql::Decl& entry) {
282294
for (auto member : decl.getMembers()) {
283-
if (swift::AvailableAttr::isUnavailable(member)) {
284-
continue;
285-
}
295+
// TODO: Swift 6.2 unavailable members
286296
entry.members.emplace_back(dispatcher.fetchLabel(member));
287297
}
288298
}
@@ -342,14 +352,6 @@ codeql::OpaqueTypeDecl DeclTranslator::translateOpaqueTypeDecl(const swift::Opaq
342352
return entry;
343353
}
344354

345-
codeql::PoundDiagnosticDecl DeclTranslator::translatePoundDiagnosticDecl(
346-
const swift::PoundDiagnosticDecl& decl) {
347-
auto entry = createEntry(decl);
348-
entry.kind = translateDiagnosticsKind(decl.getKind());
349-
entry.message = dispatcher.fetchLabel(decl.getMessage());
350-
return entry;
351-
}
352-
353355
codeql::MissingMemberDecl DeclTranslator::translateMissingMemberDecl(
354356
const swift::MissingMemberDecl& decl) {
355357
auto entry = createEntry(decl);

‎swift/extractor/translators/DeclTranslator.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class DeclTranslator : public AstTranslatorBase<DeclTranslator> {
4545
codeql::ImportDecl translateImportDecl(const swift::ImportDecl& decl);
4646
codeql::ModuleDecl translateModuleDecl(const swift::ModuleDecl& decl);
4747
codeql::OpaqueTypeDecl translateOpaqueTypeDecl(const swift::OpaqueTypeDecl& decl);
48-
codeql::PoundDiagnosticDecl translatePoundDiagnosticDecl(const swift::PoundDiagnosticDecl& decl);
4948
codeql::MissingMemberDecl translateMissingMemberDecl(const swift::MissingMemberDecl& decl);
5049
codeql::CapturedDecl translateCapturedValue(const swift::CapturedValue& capture);
5150
codeql::MacroDecl translateMacroDecl(const swift::MacroDecl& decl);

‎swift/extractor/translators/ExprTranslator.cpp‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,6 @@ codeql::ObjCSelectorExpr ExprTranslator::translateObjCSelectorExpr(
185185
return entry;
186186
}
187187

188-
codeql::OneWayExpr ExprTranslator::translateOneWayExpr(const swift::OneWayExpr& expr) {
189-
auto entry = createExprEntry(expr);
190-
entry.sub_expr = dispatcher.fetchLabel(expr.getSubExpr());
191-
return entry;
192-
}
193-
194188
codeql::OpenExistentialExpr ExprTranslator::translateOpenExistentialExpr(
195189
const swift::OpenExistentialExpr& expr) {
196190
auto entry = createExprEntry(expr);
@@ -498,7 +492,7 @@ TrapLabel<KeyPathComponentTag> ExprTranslator::emitKeyPathComponent(
498492
const swift::KeyPathExpr::Component& component) {
499493
auto entry = dispatcher.createUncachedEntry(component);
500494
entry.kind = static_cast<int>(component.getKind());
501-
if (auto subscript_args = component.getSubscriptArgs()) {
495+
if (auto subscript_args = component.getArgs()) {
502496
for (const auto& arg : *subscript_args) {
503497
entry.subscript_arguments.push_back(emitArgument(arg));
504498
}
@@ -691,8 +685,8 @@ codeql::CurrentContextIsolationExpr ExprTranslator::translateCurrentContextIsola
691685

692686
codeql::TypeValueExpr ExprTranslator::translateTypeValueExpr(const swift::TypeValueExpr& expr) {
693687
auto entry = createExprEntry(expr);
694-
if (expr.getParamTypeRepr() && expr.getParamType()) {
695-
entry.type_repr = dispatcher.fetchLabel(expr.getParamTypeRepr(), expr.getParamType());
688+
if (expr.getRepr() && expr.getParamType()) {
689+
entry.type_repr = dispatcher.fetchLabel(expr.getRepr(), expr.getParamType());
696690
}
697691
return entry;
698692
}

‎swift/extractor/translators/ExprTranslator.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
3737
codeql::MakeTemporarilyEscapableExpr translateMakeTemporarilyEscapableExpr(
3838
const swift::MakeTemporarilyEscapableExpr& expr);
3939
codeql::ObjCSelectorExpr translateObjCSelectorExpr(const swift::ObjCSelectorExpr& expr);
40-
codeql::OneWayExpr translateOneWayExpr(const swift::OneWayExpr& expr);
4140
codeql::OpenExistentialExpr translateOpenExistentialExpr(const swift::OpenExistentialExpr& expr);
4241
codeql::OptionalEvaluationExpr translateOptionalEvaluationExpr(
4342
const swift::OptionalEvaluationExpr& expr);

‎swift/extractor/translators/StmtTranslator.cpp‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,9 @@ void StmtTranslator::translateAndEmit(const swift::PoundAvailableInfo& availabil
3636
}
3737

3838
void StmtTranslator::translateAndEmit(const swift::AvailabilitySpec& spec) {
39-
if (llvm::isa<swift::PlatformVersionConstraintAvailabilitySpec>(spec)) {
40-
translateAndEmit(llvm::cast<swift::PlatformVersionConstraintAvailabilitySpec>(spec));
41-
} else if (llvm::isa<swift::OtherPlatformAvailabilitySpec>(spec)) {
42-
translateAndEmit(llvm::cast<swift::OtherPlatformAvailabilitySpec>(spec));
43-
}
44-
}
45-
46-
void StmtTranslator::translateAndEmit(
47-
const swift::PlatformVersionConstraintAvailabilitySpec& spec) {
48-
auto entry = dispatcher.createEntry(spec);
49-
entry.platform = swift::platformString(spec.getPlatform()).str();
50-
entry.version = spec.getVersion().getAsString();
51-
dispatcher.emit(entry);
52-
}
53-
54-
void StmtTranslator::translateAndEmit(const swift::OtherPlatformAvailabilitySpec& spec) {
55-
dispatcher.emit(dispatcher.createEntry(spec));
39+
// auto entry = dispatcher.createEntry(spec);
40+
// TODO: Swift 6.2 platform version/wildcard
41+
// dispatcher.emit(entry);
5642
}
5743

5844
codeql::BraceStmt StmtTranslator::translateBraceStmt(const swift::BraceStmt& stmt) {

‎swift/extractor/translators/StmtTranslator.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ class StmtTranslator : public AstTranslatorBase<StmtTranslator> {
1717
void translateAndEmit(const swift::CaseLabelItem& labelItem);
1818
void translateAndEmit(const swift::PoundAvailableInfo& availability);
1919
void translateAndEmit(const swift::AvailabilitySpec& spec);
20-
void translateAndEmit(const swift::PlatformVersionConstraintAvailabilitySpec& spec);
21-
void translateAndEmit(const swift::OtherPlatformAvailabilitySpec& spec);
2220

2321
codeql::BraceStmt translateBraceStmt(const swift::BraceStmt& stmt);
2422
codeql::ReturnStmt translateReturnStmt(const swift::ReturnStmt& stmt);

0 commit comments

Comments
 (0)