Merge pull request #84931 from hnrklssn/swift-function-caller-generator

Add swift-function-caller-generator

Author: hnrklssn

test/CMakeLists.txt

@@ -104,7 +104,9 @@ function(get_test_dependencies SDK result_var_name)
     endif()
 
     if(SWIFT_BUILD_SWIFT_SYNTAX)
-      list(APPEND deps_binaries swift-plugin-server)
+      list(APPEND deps_binaries
+        swift-plugin-server
+        swift-function-caller-generator)
     endif()
   endif()
 

test/Utils/swift-function-caller-generator/basic.swift

@@ -0,0 +1,39 @@
+// RUN: %empty-directory(%t)
+// RUN: split-file %s %t
+// RUN: %swift-function-caller-generator Test %t/test.swift > %t/out.swift
+// RUN: %diff %t/out.swift %t/out.swift.expected
+
+//--- test.swift
+func foo(x: Int) -> Int
+
+func bar(_ y: UnsafePointer<CInt>)
+
+@_lifetime(borrow z)
+func baz(_ z: Span<CInt>) -> Span<CInt>
+
+@_lifetime(`func`: copy `func`)
+func qux(_ func: inout MutableSpan<CInt>)
+
+//--- out.swift.expected
+import Test
+
+func call_foo(x: Int) -> Int {
+  return foo(x: x)
+}
+
+
+func call_bar(_ y: UnsafePointer<CInt>) {
+  return unsafe bar(y)
+}
+
+
+@_lifetime(borrow z)
+func call_baz(_ z: Span<CInt>) -> Span<CInt> {
+  return baz(z)
+}
+
+
+@_lifetime(`func`: copy `func`)
+func call_qux(_ func: inout MutableSpan<CInt>) {
+  return qux(&`func`)
+}

test/Utils/swift-function-caller-generator/compile.swift

@@ -0,0 +1,26 @@
+// REQUIRES: swift_feature_LifetimeDependence
+// REQUIRES: swift_feature_Lifetimes
+
+// RUN: %empty-directory(%t)
+
+// RUN: %target-build-swift -emit-module %s -enable-experimental-feature Lifetimes -enable-experimental-feature LifetimeDependence -o %t/%target-library-name(Test) -module-name Test -emit-library
+
+// RUN: %target-swift-emit-module-interface(%t/Test.swiftinterface) %s -enable-experimental-feature Lifetimes -enable-experimental-feature LifetimeDependence
+// RUN: %swift-function-caller-generator Test %t/Test.swiftinterface > %t/out.swift
+
+// RUN: %target-swift-frontend-verify -typecheck -strict-memory-safety %t/out.swift -I %t
+
+func foo(x: Int) -> Int {
+  return x
+}
+
+func bar(_ y: UnsafePointer<CInt>) {}
+
+@_lifetime(borrow z)
+func baz(_ z: Span<CInt>) -> Span<CInt> {
+  return z
+}
+
+@_lifetime(`func`: copy `func`)
+func qux(_ func: inout MutableSpan<CInt>) {}
+

test/lit.cfg

@@ -362,6 +362,7 @@ config.wasm_ld = inferSwiftBinary('wasm-ld')
 config.swift_plugin_server = inferSwiftBinary('swift-plugin-server')
 config.swift_parse_test = inferSwiftBinary('swift-parse-test')
 config.swift_scan_test = inferSwiftBinary('swift-scan-test')
+config.swift_function_caller_generator = inferSwiftBinary('swift-function-caller-generator')
 
 config.swift_utils = make_path(config.swift_src_root, 'utils')
 config.line_directive = make_path(config.swift_utils, 'line-directive')
@@ -759,6 +760,7 @@ config.substitutions.append( ('%swift-parse-test', config.swift_parse_test) )
 config.substitutions.append( ('%swift-scan-test', config.swift_scan_test) )
 config.substitutions.append( ('%swift-symbolgraph-extract', config.swift_symbolgraph_extract) )
 config.substitutions.append( ('%swift-synthesize-interface', config.swift_synthesize_interface) )
+config.substitutions.append( ('%swift-function-caller-generator', config.swift_function_caller_generator) )
 config.substitutions.append( ('%validate-json', f"{config.python} -m json.tool") )
 
 config.clang_include_dir = make_path(config.llvm_obj_root, 'include')

tools/CMakeLists.txt

@@ -27,6 +27,7 @@ add_swift_tool_subdirectory(libStaticMirror)
 add_swift_tool_subdirectory(libMockPlugin)
 add_swift_tool_subdirectory(swift-plugin-server)
 add_swift_tool_subdirectory(swift-scan-test)
+add_swift_tool_subdirectory(swift-function-caller-generator)
 
 if(SWIFT_INCLUDE_TESTS OR SWIFT_INCLUDE_TEST_BINARIES)
   add_swift_tool_subdirectory(swift-ide-test)

tools/swift-function-caller-generator/CMakeLists.txt

@@ -0,0 +1,12 @@
+if (SWIFT_BUILD_SWIFT_SYNTAX)
+  add_pure_swift_host_tool(swift-function-caller-generator
+    Sources/swift-function-caller-generator/swift-function-caller-generator.swift
+    SWIFT_COMPONENT
+      testsuite-tools
+    SWIFT_DEPENDENCIES
+      SwiftSyntax
+      SwiftSyntaxBuilder
+      SwiftSyntaxMacros
+    PACKAGE_NAME Toolchain
+  )
+endif()

tools/swift-function-caller-generator/Package.swift

@@ -0,0 +1,24 @@
+// swift-tools-version: 6.2
+
+import PackageDescription
+
+let package = Package(
+  name: "swift-function-caller-generator",
+  platforms: [.macOS(.v13)],
+  products: [
+    .executable(name: "swift-function-caller-generator", targets: ["swift-function-caller-generator"]),
+  ],
+  dependencies: [
+      .package(path: "../../../swift-syntax")
+  ],
+  targets: [
+    .executableTarget(
+      name: "swift-function-caller-generator",
+      dependencies: [
+        .product(name: "SwiftSyntax", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
+        .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+      ]
+    ),
+  ],
+)