Swift: minimal 5.9 support

github · Jul 5, 2023 · 3a727a5 · 3a727a5
1 parent b651c02
commit 3a727a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 34 deletions.
diff --git a/swift/extractor/SwiftExtractor.cpp b/swift/extractor/SwiftExtractor.cpp
@@ -170,10 +170,10 @@ static std::unordered_set<swift::ModuleDecl*> extractDeclarations(
   }
 
   std::vector<swift::Token> comments;
-  if (primaryFile && primaryFile->getBufferID().hasValue()) {
+  if (primaryFile && primaryFile->getBufferID().has_value()) {
     auto& sourceManager = compiler.getSourceMgr();
     auto tokens = swift::tokenize(compiler.getInvocation().getLangOptions(), sourceManager,
-                                  primaryFile->getBufferID().getValue());
+                                  primaryFile->getBufferID().value());
     for (auto& token : tokens) {
       if (token.getKind() == swift::tok::comment) {
         comments.push_back(token);

diff --git a/swift/extractor/infra/SwiftTagTraits.h b/swift/extractor/infra/SwiftTagTraits.h
@@ -56,6 +56,7 @@ MAP(swift::Stmt, StmtTag)
   MAP(swift::FailStmt, FailStmtTag)
   MAP(swift::ThrowStmt, ThrowStmtTag)
   MAP(swift::PoundAssertStmt, PoundAssertStmtTag)
+  MAP(swift::DiscardStmt, void) // TODO (introduced in 5.9)
 
 MAP(swift::Argument, ArgumentTag)
 MAP(swift::KeyPathExpr::Component, KeyPathComponentTag)
@@ -95,7 +96,7 @@ MAP(swift::Expr, ExprTag)
   MAP(swift::IdentityExpr, IdentityExprTag)
     MAP(swift::ParenExpr, ParenExprTag)
     MAP(swift::DotSelfExpr, DotSelfExprTag)
-    MAP(swift::MoveExpr, void)  // TODO (introduced in 5.8)
+    MAP(swift::BorrowExpr, void) // TODO (introduced in 5.9)
     MAP(swift::AwaitExpr, AwaitExprTag)
     MAP(swift::UnresolvedMemberChainResultExpr, UnresolvedMemberChainResultExprTag)
   MAP(swift::AnyTryExpr, AnyTryExprTag)
@@ -189,6 +190,11 @@ MAP(swift::Expr, ExprTag)
   MAP(swift::TapExpr, TapExprTag)
   MAP(swift::TypeJoinExpr, void)  // TODO (introduced in 5.8)
   MAP(swift::MacroExpansionExpr, void)  // TODO (introduced in 5.8)
+  MAP(swift::CopyExpr, void)  // TODO (introduced in 5.9)
+  MAP(swift::ConsumeExpr, void)  // TODO (introduced in 5.9)
+  MAP(swift::MaterializePackExpr, void)  // TODO (introduced in 5.9)
+  MAP(swift::SingleValueStmtExpr, void)  // TODO (introduced in 5.9)
+
 MAP(swift::Decl, DeclTag)
   MAP(swift::ValueDecl, ValueDeclTag)
     MAP(swift::TypeDecl, TypeDeclTag)
@@ -231,6 +237,7 @@ MAP(swift::Decl, DeclTag)
     MAP(swift::PrefixOperatorDecl, PrefixOperatorDeclTag)
     MAP(swift::PostfixOperatorDecl, PostfixOperatorDeclTag)
   MAP(swift::MacroExpansionDecl, void)  // TODO (introduced in 5.8)
+  MAP(swift::MissingDecl, void)  // TODO (introduced in 5.9)
 
 MAP(swift::Pattern, PatternTag)
   MAP(swift::ParenPattern, ParenPatternTag)
@@ -266,6 +273,8 @@ MAP(swift::TypeBase, TypeTag)
     MAP(swift::BuiltinUnsafeValueBufferType, BuiltinUnsafeValueBufferTypeTag)
     MAP(swift::BuiltinDefaultActorStorageType, BuiltinDefaultActorStorageTypeTag)
     MAP(swift::BuiltinVectorType, BuiltinVectorTypeTag)
+    MAP(swift::BuiltinPackIndexType, void) // TODO: (introduced in 5.9)
+    MAP(swift::BuiltinNonDefaultDistributedActorStorageType, void) // TODO: (introduced in 5.9)
   MAP(swift::TupleType, TupleTypeTag)
   MAP(swift::ReferenceStorageType, ReferenceStorageTypeTag)
   MAP(swift::WeakStorageType, WeakStorageTypeTag)
@@ -307,13 +316,15 @@ MAP(swift::TypeBase, TypeTag)
   MAP(swift::SILBoxType, void)  // SIL types cannot really appear in the frontend run)
   MAP(swift::SILMoveOnlyWrappedType, void)  // SIL types cannot really appear in the frontend run)
   MAP(swift::SILTokenType, void)  // SIL types cannot really appear in the frontend run)
+  MAP(swift::SILPackType, void)  // TODO: (introduced in 5.9)
   MAP(swift::ProtocolCompositionType, ProtocolCompositionTypeTag)
   MAP(swift::ParameterizedProtocolType, ParameterizedProtocolTypeTag)
   MAP(swift::ExistentialType, ExistentialTypeTag)
   MAP(swift::LValueType, LValueTypeTag)
   MAP(swift::InOutType, InOutTypeTag)
   MAP(swift::PackType, void)  // experimental variadic generics
   MAP(swift::PackExpansionType, void)  // experimental variadic generics
+  MAP(swift::PackElementType, void) // TODO: (introduced in 5.9)
   MAP(swift::TypeVariableType, void)  // created during type checking and only used for constraint checking
   MAP(swift::SugarType, SugarTypeTag)
     MAP(swift::ParenType, ParenTypeTag)

diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl
@@ -46,7 +46,6 @@ def load_dependencies(workspace_name):
             patches = [
                 "@%s//swift/third_party/swift-llvm-support:patches/%s.patch" % (workspace_name, patch_name)
                 for patch_name in (
-                    "remove-result-of",
                     "remove-redundant-operators",
                     "add-constructor-to-Compilation",
                 )

diff --git a/swift/third_party/swift-llvm-support/patches/remove-result-of.patch b/swift/third_party/swift-llvm-support/patches/remove-result-of.patch