Create and export libswiftIdentifier

Author: redsun82

CMakeLists.txt

@@ -10,7 +10,7 @@ message("Using Clang_CONFIG: ${LLVM_CONFIG}")
 message("Using Swift_CONFIG: ${Clang_CONFIG}")
 
 add_executable(codeql-swift-artifacts empty.cpp)
-target_link_libraries(codeql-swift-artifacts PRIVATE LLVMSupport swiftPluggableObserverDriverTool swiftCompilerModules)
+target_link_libraries(codeql-swift-artifacts PRIVATE LLVMSupport swiftFrontendTool swiftCompilerModules)
 
 if(APPLE)
   execute_process(

patches/swift/04-allow-plugging-in-observer.patch

@@ -1,3 +1,32 @@
+diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
+index 6d93e52f1d5..9ab79aeb9d6 100644
+--- a/cmake/modules/AddSwift.cmake
++++ b/cmake/modules/AddSwift.cmake
+@@ -715,6 +715,7 @@ function(add_swift_host_tool executable)
+ 
+         # Include the abi stable system stdlib in our rpath.
+         list(APPEND RPATH_LIST "/usr/lib/swift")
++        list(APPEND RPATH_LIST "${SWIFTLIB_DIR}")
+ 
+       elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS")
+ 
+@@ -731,6 +732,7 @@ function(add_swift_host_tool executable)
+ 
+         # Include the abi stable system stdlib in our rpath.
+         list(APPEND RPATH_LIST "/usr/lib/swift")
++        list(APPEND RPATH_LIST "@executable_path/../lib")
+ 
+       elseif(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING-WITH-HOSTLIBS")
+         # Add the SDK directory for the host platform.
+@@ -798,7 +800,7 @@ function(add_swift_host_tool executable)
+       if(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
+         set_target_properties(${executable} PROPERTIES
+           BUILD_WITH_INSTALL_RPATH YES
+-          INSTALL_RPATH  "${host_lib_dir}")
++          INSTALL_RPATH  "${host_lib_dir};$ORIGIN/../lib")
+       else()
+         set_target_properties(${executable} PROPERTIES
+           BUILD_WITH_INSTALL_RPATH YES
 diff --git a/include/swift/DriverTool/FrontendObserver.h b/include/swift/DriverTool/FrontendObserver.h
 new file mode 100644
 index 00000000000..4ac9b299a13
@@ -28,49 +57,68 @@ index 184e6196918..ef5c3eafe69 100644
    // TODO: maybe enhance this interface to hear about IRGen and LLVM
    // progress.
  };
+diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
+index ec3fa2c853b..9bf73c9b2fc 100644
+--- a/lib/AST/CMakeLists.txt
++++ b/lib/AST/CMakeLists.txt
+@@ -58,7 +58,6 @@ add_swift_host_library(swiftAST STATIC
+   GenericParamList.cpp
+   GenericSignature.cpp
+   GenericSignatureBuilder.cpp
+-  Identifier.cpp
+   ImportCache.cpp
+   IndexSubset.cpp
+   InlinableText.cpp
+@@ -122,6 +121,10 @@ add_swift_host_library(swiftAST STATIC
+   ${SWIFTAST_LLVM_LINK_COMPONENTS}
+   )
+ 
++add_swift_host_library(swiftIdentifier SHARED
++        Identifier.cpp
++        )
++
+ if(SWIFT_FORCE_OPTIMIZED_TYPECHECKER)
+   if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
+     target_compile_options(swiftAST PRIVATE /O2 /Ob2)
+@@ -152,7 +155,7 @@ if(NOT SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
+ endif()
+ 
+ target_link_libraries(swiftAST
+-  PUBLIC swiftBasic
++  PUBLIC swiftBasic swiftIdentifier
+   PRIVATE swiftSyntax)
+ if(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
+   # Remove dependencies from clangBasic to avoid bringing along some llvm
 diff --git a/lib/DriverTool/CMakeLists.txt b/lib/DriverTool/CMakeLists.txt
-index 869c00fece9..8787598e2bf 100644
+index 869c00fece9..21610d8eb95 100644
 --- a/lib/DriverTool/CMakeLists.txt
 +++ b/lib/DriverTool/CMakeLists.txt
-@@ -9,21 +9,34 @@ set(driver_sources_and_options
- 
- set(driver_common_libs
-                 swiftAPIDigester
-+		        swiftCompilerModules
-                 swiftDriver
-                 swiftFrontendTool
+@@ -14,16 +14,24 @@ set(driver_common_libs
                  swiftSymbolGraphGen
                  LLVMBitstreamReader)
 
--add_swift_host_library(swiftDriverTool STATIC
-+add_swift_host_library(swiftFrontendObserver STATIC
++add_swift_host_library(swiftFrontendObserver SHARED
 +   swift_frontend_observer.cpp)
 +target_link_libraries(swiftFrontendObserver
 +        PUBLIC
 +        swiftFrontendTool)
 +
-+add_swift_host_library(swiftPluggableObserverDriverTool STATIC
+ add_swift_host_library(swiftDriverTool STATIC
    ${driver_sources_and_options}
  )
--target_link_libraries(swiftDriverTool
-+target_link_libraries(swiftPluggableObserverDriverTool
+ target_link_libraries(swiftDriverTool
                        PUBLIC
-                       ${driver_common_libs})
+-                      ${driver_common_libs})
++                      ${driver_common_libs}
++		              swiftFrontendObserver)
 
-+add_library(swiftDriverTool INTERFACE)
-+target_link_libraries(swiftDriverTool INTERFACE
-+		      swiftPluggableObserverDriverTool
-+		      swiftFrontendObserver)
-+
  # If building as part of clang, make sure the headers are installed.
  if(NOT SWIFT_BUILT_STANDALONE)
--  add_dependencies(swiftDriverTool clang-resource-headers)
-+	add_dependencies(swiftPluggableObserverDriverTool clang-resource-headers)
+   add_dependencies(swiftDriverTool clang-resource-headers)
  endif()
 
--set_swift_llvm_is_available(swiftDriverTool)
 +set_swift_llvm_is_available(swiftFrontendObserver)
-+set_swift_llvm_is_available(swiftPluggableObserverDriverTool)
+ set_swift_llvm_is_available(swiftDriverTool)
 diff --git a/lib/DriverTool/driver.cpp b/lib/DriverTool/driver.cpp
 index f71e2de9eae..a500e30827f 100644
 --- a/lib/DriverTool/driver.cpp
@@ -151,3 +199,12 @@ index 811fb912f8a..afa2034aa71 100644
  void FrontendObserver::performedSILGeneration(SILModule &module) {}
  void FrontendObserver::performedSILProcessing(SILModule &module) {}
 +void FrontendObserver::finished(int status) {}
+diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
+index a5dc3ccb845..30667ae51f9 100644
+--- a/tools/driver/CMakeLists.txt
++++ b/tools/driver/CMakeLists.txt
+@@ -123,4 +123,3 @@ add_dependencies(editor-integration swift-frontend)
+ swift_install_in_component(FILES "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swift-indent${CMAKE_EXECUTABLE_SUFFIX}"
+                            DESTINATION "bin"
+                            COMPONENT editor-integration)
+-

pkg_swift_llvm.py

@@ -154,13 +154,14 @@ def export_stdlibs(exported_dir, swift_build_tree):
         'libswiftCompatibility51.a',
         'libswiftCompatibilityConcurrency.a',
         'libswiftCompatibilityDynamicReplacements.a']
+    stdlibs = [lib_dir / lib for lib in stdlibs]
+    stdlibs += [swift_build_tree / 'lib' / f'libswiftIdentifier.{ext}']
     for stdlib in stdlibs:
-        lib_path = lib_dir / stdlib
-        if lib_path.exists():
-            print(f'Copying {stdlib}')
-            shutil.copy(lib_path, exported_dir)
+        if stdlib.exists():
+            print(f'Copying {stdlib.name}')
+            shutil.copy(stdlib, exported_dir)
         else:
-            print(f'Skipping {stdlib}')
+            print(f'Skipping {stdlib.name}')
 
 
 def export_libs(exported_dir, libs, swift_build_tree):
@@ -185,6 +186,9 @@ def export_headers(exported_dir, swift_source_tree, llvm_build_tree, swift_build
     for h in header_dirs:
         copy_includes(h, exported_dir)
 
+def export_frontend(exported_dir, swift_build_tree):
+    print("exporting swift-frontend")
+    shutil.copy(swift_build_tree / 'bin' / 'swift-frontend', exported_dir)
 
 def zip_dir(src, tgt):
     tgt = get_tgt(tgt, f"swift-prebuilt-{get_platform()}.zip")
@@ -206,6 +210,7 @@ def main(opts):
     export_libs(exported, libs, opts.swift_build_tree)
     export_headers(exported, opts.swift_source_tree, opts.llvm_build_tree, opts.swift_build_tree)
     export_sdk(exported / "sdk", opts.swift_source_tree, opts.swift_build_tree)
+    export_frontend(exported, opts.swift_build_tree)
     zip_dir(exported, opts.output)