Skip to content

[Swiftify] Add support for free functions imported as instance methods #84507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+596 −11
Open

[Swiftify] Add support for free functions imported as instance methods #84507

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c1bf742
[Swiftify] Add support for free functions imported as instance methods
hnrklssn Sep 25, 2025
f3cb55d
fix tests in CI
hnrklssn Sep 25, 2025
98465bf
add namespace tests
hnrklssn Sep 25, 2025
0fff307
use swift/bridging in test
hnrklssn Sep 25, 2025
eff46b4
[Swiftify] properly forward inout parameters using `&`
hnrklssn Sep 25, 2025
a287803
try to debug CI diff failure
hnrklssn Sep 25, 2025
9427c90
[Swiftify] Reorder RUN lines (NFC)
hnrklssn Sep 26, 2025
cd4a287
deduplicate path
hnrklssn Sep 26, 2025
fd2d625
re-export std::span regardless of module name
hnrklssn Sep 26, 2025
557ae3c
DO NOT MERGE: debug CI failure
hnrklssn Sep 26, 2025
51c8c99
does this fix linux crash?
hnrklssn Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/Interop/C/swiftify-import/import-as-instance-method.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// RUN: %empty-directory(%t)
// RUN: split-file %s %t

// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/Test.swiftmodule -I %t/Inputs -enable-experimental-feature SafeInteropWrappers -strict-memory-safety -warnings-as-errors -Xcc -Werror %t/test.swift -dump-macro-expansions 2> %t/out.txt
// RUN: diff %t/out.txt %t/out.expected
// RUN: env SWIFT_BACKTRACE="" %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/Test.swiftmodule -I %t/Inputs -enable-experimental-feature SafeInteropWrappers -strict-memory-safety -warnings-as-errors -Xcc -Werror %t/test.swift -dump-macro-expansions 2> %t/out.txt
// RUN: diff --strip-trailing-cr %t/out.txt %t/out.expected
// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/Test.swiftmodule -I %t/Inputs -enable-experimental-feature SafeInteropWrappers -strict-memory-safety -verify -verify-additional-file %t/Inputs/instance.h %t/test.swift -DVERIFY

//--- test.swift
Expand Down
55 changes: 52 additions & 3 deletions test/Interop/Cxx/swiftify-import/import-as-instance-method.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@
// RUN: %empty-directory(%t)
// RUN: split-file %s %t

// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/Test.swiftmodule -I %t/Inputs -enable-experimental-feature SafeInteropWrappers -strict-memory-safety -warnings-as-errors -Xcc -Werror %t/test.swift -cxx-interoperability-mode=default -Xcc -std=c++20 -dump-macro-expansions 2> %t/out.txt
// RUN: diff %t/out.txt %t/out.expected
// RUN: env SWIFT_BACKTRACE="" %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/Test.swiftmodule -I %t/Inputs -enable-experimental-feature SafeInteropWrappers -strict-memory-safety -warnings-as-errors -Xcc -Werror %t/test.swift -cxx-interoperability-mode=default -Xcc -std=c++20 -dump-macro-expansions 2> %t/out.txt
// RUN: diff --strip-trailing-cr %t/out.txt %t/out.expected
// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/Test.swiftmodule -I %t/Inputs -enable-experimental-feature SafeInteropWrappers -strict-memory-safety -warnings-as-errors -Xcc -Werror %t/test.swift -cxx-interoperability-mode=default -Xcc -std=c++20 -verify -verify-additional-file %t/Inputs/instance.h %t/test.swift -DVERIFY

//--- test.swift
import Instance

func foo(_ p: inout MutableSpan<CInt>, a: A, aa: inout A, s: IntSpan, cs: ConstIntSpan, asp: AliasingSpan) {
func foo(_ p: inout MutableSpan<CInt>, a: A, aa: inout A, s: IntSpan, cs: ConstIntSpan, asp: AliasingSpan, b: inout baz.B) {
aa.basic(&p)
aa.bar(&p)
a.constSelf(&p)
a.valSelf(&p)
aa.refSelf(&p)
aa.namespaced(&p)
b.decapseman(&p)

let _: IntSpan = unsafe s.spanSelf()
let _: MutableSpan<CInt> = unsafe s.spanSelf()
Expand Down Expand Up @@ -57,6 +59,13 @@ const IntSpan spanConstSelf(const IntSpan p __lifetimebound) __attribute__((swif

ConstIntSpan constSpanSelf(ConstIntSpan p __lifetimebound) __attribute__((swift_name("ConstIntSpan.constSpanSelf(self:)")));

namespace baz {
void namespaced(A *a, IntSpan p __noescape) __attribute__((swift_name("A.namespaced(self:_:)")));
struct B {};
}

void decapseman(baz::B *b, IntSpan p __noescape) __attribute__((swift_name("baz.B.decapseman(self:_:)")));

//--- Inputs/module.modulemap
module Instance {
header "instance.h"
Expand Down Expand Up @@ -164,6 +173,46 @@ public func refSelf(_ a: inout A, _ p: inout MutableSpan<CInt>) {
}
}
------------------------------
@__swiftmacro_So1AV10namespaced15_SwiftifyImportfMp_.swift
------------------------------
/// This is an auto-generated wrapper for safer interop
@_alwaysEmitIntoClient @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *) @_lifetime(p: copy p) @_disfavoredOverload
public mutating func namespaced(_ p: inout MutableSpan<CInt>) {
return unsafe p.withUnsafeMutableBufferPointer { _pPtr in
return unsafe namespaced(IntSpan(_pPtr))
}
}
------------------------------
@__swiftmacro_So3bazO10namespaced15_SwiftifyImportfMp_.swift
------------------------------
/// This is an auto-generated wrapper for safer interop
@available(swift, obsoleted: 3, renamed: "A.namespaced(self:_:)") @_alwaysEmitIntoClient @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *) @_lifetime(p: copy p) @_disfavoredOverload
public static func namespaced(_ a: UnsafeMutablePointer<A>!, _ p: inout MutableSpan<CInt>) {
return unsafe p.withUnsafeMutableBufferPointer { _pPtr in
return unsafe namespaced(a, IntSpan(_pPtr))
}
}
------------------------------
@__swiftmacro_So3bazO1BV8InstanceE10decapseman15_SwiftifyImportfMp_.swift
------------------------------
/// This is an auto-generated wrapper for safer interop
@_alwaysEmitIntoClient @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *) @_lifetime(p: copy p) @_disfavoredOverload
public mutating func decapseman(_ p: inout MutableSpan<CInt>) {
return unsafe p.withUnsafeMutableBufferPointer { _pPtr in
return unsafe decapseman(IntSpan(_pPtr))
}
}
------------------------------
@__swiftmacro_So10decapseman15_SwiftifyImportfMp_.swift
------------------------------
/// This is an auto-generated wrapper for safer interop
@available(swift, obsoleted: 3, renamed: "baz.B.decapseman(self:_:)") @_alwaysEmitIntoClient @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *) @_lifetime(p: copy p) @_disfavoredOverload
public func decapseman(_ b: UnsafeMutablePointer<baz.B>!, _ p: inout MutableSpan<CInt>) {
return unsafe p.withUnsafeMutableBufferPointer { _pPtr in
return unsafe decapseman(b, IntSpan(_pPtr))
}
}
------------------------------
@__swiftmacro_So3stdO3__1O0056spanCInt_CUnsignedLong_18446744073709551615_syGJqopasxheV8InstanceE8spanSelf15_SwiftifyImportfMp_.swift
------------------------------
/// This is an auto-generated wrapper for safer interop
Expand Down