fix

Author: rintaro

include/swift/Basic/FixedBitSet.h

@@ -78,7 +78,7 @@ class FixedBitSet {
   static size_t chunkIndex(ValueType i) {
     return size_t(i) / chunkSize;
   }
-  static size_t chunkMask(ValueType i) {
+  static ChunkType chunkMask(ValueType i) {
     return ChunkType(1) << (size_t(i) % chunkSize);
   }
 

lib/ASTGen/CMakeLists.txt

@@ -42,8 +42,16 @@ add_pure_swift_host_library(swiftASTGen STATIC
 
   DEPENDENCIES
     swiftAST
-    swiftSyntaxUnified
   SWIFT_DEPENDENCIES
+    _CompilerSwiftSyntax
+    _CompilerSwiftOperators
+    _CompilerSwiftSyntaxBuilder
+    _CompilerSwiftParser
+    _CompilerSwiftParserDiagnostics
+    _CompilerSwiftCompilerPluginMessageHandling
+    _CompilerSwiftSyntaxMacroExpansion
+    _CompilerSwiftDiagnostics
+    _CompilerSwiftIDEUtils
     ${ASTGen_Swift_dependencies}
 )
 
@@ -52,11 +60,11 @@ add_pure_swift_host_library(swiftIDEUtilsBridging
 
   DEPENDENCIES
     swiftAST
+  SWIFT_DEPENDENCIES
+    _CompilerSwiftSyntax
     swiftASTGen
-    swiftSyntaxUnified
 )
 
-
 set(c_include_paths
   # LLVM modules and headers.
   "${LLVM_MAIN_INCLUDE_DIR}"

lib/ASTGen/Package.swift

@@ -57,15 +57,13 @@ let package = Package(
     .target(
       name: "swiftASTGen",
       dependencies: [
-        .product(name: "SwiftBasicFormat", package: "swift-syntax"),
         .product(name: "SwiftCompilerPluginMessageHandling", package: "swift-syntax"),
         .product(name: "SwiftDiagnostics", package: "swift-syntax"),
         .product(name: "SwiftOperators", package: "swift-syntax"),
         .product(name: "SwiftParser", package: "swift-syntax"),
         .product(name: "SwiftParserDiagnostics", package: "swift-syntax"),
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
         .product(name: "SwiftSyntaxMacroExpansion", package: "swift-syntax"),
         "_CompilerRegexParser",
       ],

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -19,7 +19,6 @@ import SwiftParser
 import SwiftSyntax
 import SwiftSyntaxBuilder
 @_spi(ExperimentalLanguageFeature) @_spi(Compiler) import SwiftSyntaxMacroExpansion
-@_spi(ExperimentalLanguageFeature) import SwiftSyntaxMacros
 
 struct ExportedExternalMacro {
   var moduleName: String
@@ -862,21 +861,3 @@ func expandAttachedMacroImpl(
   }
 }
 
-fileprivate extension SyntaxProtocol {
-  /// Perform a format if required and then trim any leading/trailing
-  /// whitespace.
-  func formattedExpansion(_ mode: FormatMode) -> String {
-    let formatted: Syntax
-    switch mode {
-    case .auto:
-      formatted = self.formatted()
-    case .disabled:
-      formatted = Syntax(self)
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
-    }
-    return formatted.trimmedDescription(matching: { $0.isWhitespace })
-  }
-}

lib/ASTGen/Sources/ASTGen/SourceManager.swift

@@ -14,7 +14,6 @@ import ASTBridging
 import BasicBridging
 import SwiftOperators
 import SwiftSyntax
-import SwiftSyntaxMacros
 
 /// A source manager that keeps track of the source files in the program.
 class SourceManager {

lib/CompilerSwiftSyntax/CMakeLists.txt

@@ -9,9 +9,9 @@ endif()
 # Build swift-syntax libraries with FetchContent.
 function(includeSwiftSyntax)
   set(CMAKE_Swift_COMPILER_TARGET ${SWIFT_HOST_TRIPLE})
-  set(BUILD_SHARED_LIBS OFF)
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+  set(BUILD_SHARED_LIBS ON)
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${SWIFT_HOST_LIBRARIES_DEST_DIR}/compiler")
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${SWIFT_HOST_LIBRARIES_DEST_DIR}/compiler")
 
   # Add unique ABI prefix to swift-syntax libraries so that compiler libraries (e.g. sourcekitdInProc)
   # can be used from tools that has its own swift-syntax libraries as SwiftPM dependencies.
@@ -25,35 +25,9 @@ function(includeSwiftSyntax)
 endfunction()
 includeSwiftSyntax()
 
-# Make unified swift-syntax shared library.
-add_pure_swift_host_library(swiftSyntaxUnified SHARED)
 
-macro(target_link_libraries_whole_archive target)
-  set_property(TARGET ${target} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 
-  set(link_files)
-  foreach(lib ${ARGN}) 
-    force_add_dependencies(${target} ${lib})
-
-    # Set dummy auto linking name to avoid trying to link with indivisual library.
-    target_compile_options(${lib} PRIVATE "SHELL:-module-link-name swiftCore")
-
-    # Link all the object file into one unified library.
-    list(APPEND link_files $<TARGET_OBJECTS:${lib}>)
-
-    # Make the '.swiftmodule' visible from targets linking with the unified library.
-    set_property(TARGET ${target} APPEND PROPERTY
-      INTERFACE_INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:${lib},INTERFACE_INCLUDE_DIRECTORIES>"
-    )
-  endforeach()
-
-  file(GENERATE
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/link_files.txt
-    CONTENT "$<JOIN:${link_files},\n>")
-  target_link_options(${target} PRIVATE "@${CMAKE_CURRENT_BINARY_DIR}/link_files.txt")
-endmacro()
-
-target_link_libraries_whole_archive(swiftSyntaxUnified 
+set(compiler_swiftsyntax_libs
   _CompilerSwiftSyntax
   _CompilerSwiftOperators
   _CompilerSwiftSyntaxBuilder
@@ -67,10 +41,11 @@ target_link_libraries_whole_archive(swiftSyntaxUnified
   _CompilerSwiftIDEUtils
 )
 
-set_property(TARGET swiftSyntaxUnified PROPERTY
-  LIBRARY_OUTPUT_DIRECTORY "${SWIFT_HOST_LIBRARIES_DEST_DIR}/compiler"
-)
-swift_install_in_component(TARGETS swiftSyntaxUnified
+foreach(lib ${compiler_swiftsyntax_libs})
+  target_compile_options(${lib} PRIVATE "SHELL:-module-link-name ${lib}")
+endforeach()
+
+swift_install_in_component(TARGETS ${compiler_swiftsyntax_libs}
   ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/compiler" COMPONENT compiler
   LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/compiler" COMPONENT compiler
   RUNTIME DESTINATION "bin" COMPONENT compiler)

lib/DriverTool/CMakeLists.txt

@@ -30,6 +30,17 @@ target_link_libraries(swiftDriverTool
                       PUBLIC
                       ${driver_common_libs})
 
+if (SWIFT_BUILD_SWIFT_SYNTAX)
+    target_link_libraries(swiftDriverTool
+    PRIVATE
+    swiftASTGen
+  )
+
+  add_dependencies(swiftDriverTool
+    swiftASTGen
+  )
+endif()
+
 # If building as part of clang, make sure the headers are installed.
 if(NOT SWIFT_BUILT_STANDALONE)
   add_dependencies(swiftDriverTool clang-resource-headers)

lib/Frontend/CMakeLists.txt

@@ -37,4 +37,15 @@ target_link_libraries(swiftFrontend PRIVATE
   swiftSerialization
   swiftSymbolGraphGen)
 
+if (SWIFT_BUILD_SWIFT_SYNTAX)
+  target_link_libraries(swiftFrontend
+    PRIVATE
+    swiftASTGen
+  )
+
+  add_dependencies(swiftFrontend
+    swiftASTGen
+  )
+endif()
+
 set_swift_llvm_is_available(swiftFrontend)