Add test case to ensure working static link with concurrency module

Author: kateinoigakukun

test/Driver/static-stdlib-autolink-linux.swift

@@ -0,0 +1,27 @@
+// Statically link a program with concurrency module
+// REQUIRES: OS=linux-gnu
+// REQUIRES: static_stdlib
+// REQUIRES: concurrency
+// REQUIRES: libdispatch_static
+
+// RUN: %empty-directory(%t)
+// RUN: echo 'public func asyncFunc() async { print("Hello") }' > %t/asyncModule.swift
+
+// RUN: %target-swiftc_driver -emit-library -emit-module -module-name asyncModule -module-link-name asyncModule %t/asyncModule.swift -static -static-stdlib -o %t/libasyncModule.a
+// TODO: "-ldispatch -lBlocksRuntime" should be told by asyncModule.swiftmodule transitively
+// RUN: %target-swiftc_driver -parse-as-library -static -static-stdlib -module-name main %s %import-static-libdispatch -I%t -L%t -ldispatch -lBlocksRuntime -o %t/main
+
+// RUN: %t/main | %FileCheck %s
+// CHECK: Hello
+// RUN: ldd %t/main | %FileCheck %s --check-prefix=LDD
+// LDD-NOT: libswiftCore.so 
+// LDD-NOT: libswift_Concurrency.so 
+
+import asyncModule
+
+@main
+struct Main {
+  static func main() async {
+    await asyncFunc()
+  }
+}

test/lit.cfg

@@ -1283,17 +1283,31 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
 
     libdispatch_artifact_dir = config.libdispatch_build_path
     libdispatch_swift_module_dir = make_path(libdispatch_artifact_dir, 'src', 'swift', 'swift')
+    libdispatch_source_dir = make_path(config.swift_src_root, os.pardir, 'swift-corelibs-libdispatch')
     libdispatch_artifacts = [
         make_path(libdispatch_artifact_dir, 'libdispatch.so'),
         make_path(libdispatch_artifact_dir, 'libswiftDispatch.so'),
         make_path(libdispatch_swift_module_dir, 'Dispatch.swiftmodule')]
     if (all(os.path.exists(p) for p in libdispatch_artifacts)):
         config.available_features.add('libdispatch')
         config.libdispatch_artifact_dir = libdispatch_artifact_dir
-        libdispatch_source_dir = make_path(config.swift_src_root, os.pardir, 'swift-corelibs-libdispatch')
         config.import_libdispatch = ('-I %s -I %s -L %s'
             % (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_artifact_dir))
 
+    libdispatch_static_artifact_dir = config.libdispatch_static_build_path
+    libdispatch_swift_static_module_dir = make_path(libdispatch_static_artifact_dir, 'src', 'swift', 'swift')
+    libdispatch_static_artifacts = [
+        make_path(libdispatch_static_artifact_dir, 'src', 'libdispatch.a'),
+        make_path(libdispatch_static_artifact_dir, 'src', 'swift', 'libswiftDispatch.a'),
+        make_path(libdispatch_swift_static_module_dir, 'Dispatch.swiftmodule')]
+    if (all(os.path.exists(p) for p in libdispatch_static_artifacts)):
+        config.available_features.add('libdispatch_static')
+        config.import_libdispatch_static = ('-I %s -I %s -L %s -L %s -L %s'
+            % (libdispatch_source_dir, libdispatch_swift_static_module_dir,
+            make_path(libdispatch_static_artifact_dir, 'src'),
+            make_path(libdispatch_static_artifact_dir, 'src', 'BlocksRuntime'),
+            make_path(libdispatch_static_artifact_dir, 'src', 'swift')))
+
     config.target_build_swift = (
         '%s -target %s -toolchain-stdlib-rpath %s %s %s %s %s'
         % (config.swiftc, config.variant_triple, resource_dir_opt, mcp_opt,
@@ -2100,6 +2114,7 @@ run_filecheck = '%s %s --sanitize BUILD_DIR=%s --sanitize SOURCE_DIR=%s --use-fi
 config.substitutions.append(('%FileCheck', run_filecheck))
 config.substitutions.append(('%raw-FileCheck', shell_quote(config.filecheck)))
 config.substitutions.append(('%import-libdispatch', getattr(config, 'import_libdispatch', '')))
+config.substitutions.append(('%import-static-libdispatch', getattr(config, 'import_libdispatch_static', '')))
 
 if config.lldb_build_root != "":
     lldb_python_path = get_lldb_python_path(config.lldb_build_root)

test/lit.site.cfg.in

@@ -34,6 +34,7 @@ config.swift_test_results_dir = \
 config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
 config.lldb_build_root = "@LLDB_BUILD_DIR@"
 config.libdispatch_build_path = "@SWIFT_PATH_TO_LIBDISPATCH_BUILD@"
+config.libdispatch_static_build_path = "@SWIFT_PATH_TO_LIBDISPATCH_STATIC_BUILD@"
 config.swift_driver_test_options = "@SWIFT_DRIVER_TEST_OPTIONS@"
 config.swift_frontend_test_options = "@SWIFT_FRONTEND_TEST_OPTIONS@"
 

utils/build-script-impl

@@ -1966,6 +1966,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DSWIFT_PATH_TO_CMARK_BUILD:PATH="$(build_directory ${host} cmark)"
                     -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE:PATH="${LIBDISPATCH_SOURCE_DIR}"
                     -DSWIFT_PATH_TO_LIBDISPATCH_BUILD:PATH="$(build_directory ${host} libdispatch)"
+                    -DSWIFT_PATH_TO_LIBDISPATCH_STATIC_BUILD:PATH="$(build_directory ${host} libdispatch_static)"
                 )
 
                 if [[ ! "${SKIP_BUILD_LIBICU}" ]] ; then

validation-test/lit.site.cfg.in

@@ -56,6 +56,7 @@ else:
 config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
 config.lldb_build_root = "@LLDB_BUILD_DIR@"
 config.libdispatch_build_path = "@SWIFT_PATH_TO_LIBDISPATCH_BUILD@"
+config.libdispatch_static_build_path = "@SWIFT_PATH_TO_LIBDISPATCH_STATIC_BUILD@"
 
 if "@SWIFT_ASAN_BUILD@" == "TRUE":
     config.available_features.add("asan")