Skip to content

Commit d0be4a4

Browse files
committed
BridgeJS: Attempt to fix issue within PlayBridgeJS:
wasm-ld: error: import module mismatch for symbol: $s13JavaScriptKit21_swift_js_pop_pointerSvyF >>> defined as bjs in /Users/krzysztofrodak/git/JavaScriptKit/Examples/PlayBridgeJS/.build/wasm32-unknown-wasip1-threads/release/JavaScriptKit.build/BridgeJSIntrinsics.swift.o >>> defined as env in /Users/krzysztofrodak/git/JavaScriptKit/Examples/PlayBridgeJS/.build/wasm32-unknown-wasip1-threads/release/PlayBridgeJS.build/main.swift.o
1 parent c9b5d9b commit d0be4a4

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

Sources/JavaScriptKit/BridgeJSIntrinsics.swift

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ extension _BridgedSwiftHeapObject {
325325
@_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ pointer: UnsafeMutableRawPointer) -> Self {
326326
Unmanaged<Self>.fromOpaque(pointer).takeUnretainedValue()
327327
}
328-
@_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self {
328+
@_spi(BridgeJS) @inline(never) public static func bridgeJSLiftParameter() -> Self {
329329
bridgeJSLiftParameter(_swift_js_pop_pointer())
330330
}
331331
@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer {
@@ -828,7 +828,7 @@ extension UnsafeMutableRawPointer: _BridgedSwiftStackType {
828828
{
829829
pointer
830830
}
831-
@_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafeMutableRawPointer {
831+
@_spi(BridgeJS) @inline(never) public static func bridgeJSLiftParameter() -> UnsafeMutableRawPointer {
832832
bridgeJSLiftParameter(_swift_js_pop_pointer())
833833
}
834834
@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { self }
@@ -858,7 +858,7 @@ extension UnsafeRawPointer: _BridgedSwiftStackType {
858858
{
859859
UnsafeRawPointer(pointer)
860860
}
861-
@_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafeRawPointer {
861+
@_spi(BridgeJS) @inline(never) public static func bridgeJSLiftParameter() -> UnsafeRawPointer {
862862
bridgeJSLiftParameter(_swift_js_pop_pointer())
863863
}
864864
@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer {
@@ -890,7 +890,7 @@ extension OpaquePointer: _BridgedSwiftStackType {
890890
{
891891
OpaquePointer(UnsafeRawPointer(pointer))
892892
}
893-
@_spi(BridgeJS) public static func bridgeJSLiftParameter() -> OpaquePointer {
893+
@_spi(BridgeJS) @inline(never) public static func bridgeJSLiftParameter() -> OpaquePointer {
894894
bridgeJSLiftParameter(_swift_js_pop_pointer())
895895
}
896896
@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer {
@@ -922,9 +922,15 @@ extension UnsafePointer {
922922
{
923923
UnsafeRawPointer(pointer).assumingMemoryBound(to: Pointee.self)
924924
}
925+
@_spi(BridgeJS) @inline(never) public static func bridgeJSLiftParameter() -> UnsafePointer<Pointee> {
926+
bridgeJSLiftParameter(_swift_js_pop_pointer())
927+
}
925928
@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer {
926929
bridgeJSLowerParameter()
927930
}
931+
@_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() {
932+
_swift_js_push_pointer(bridgeJSLowerParameter())
933+
}
928934
}
929935

930936
extension UnsafeMutablePointer {
@@ -948,9 +954,15 @@ extension UnsafeMutablePointer {
948954
{
949955
pointer.assumingMemoryBound(to: Pointee.self)
950956
}
957+
@_spi(BridgeJS) @inline(never) public static func bridgeJSLiftParameter() -> UnsafeMutablePointer<Pointee> {
958+
bridgeJSLiftParameter(_swift_js_pop_pointer())
959+
}
951960
@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer {
952961
bridgeJSLowerParameter()
953962
}
963+
@_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() {
964+
_swift_js_push_pointer(bridgeJSLowerParameter())
965+
}
954966
}
955967

956968
extension Optional where Wrapped == Bool {
@@ -1285,7 +1297,7 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject {
12851297
}
12861298
}
12871299

1288-
@_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? {
1300+
@_spi(BridgeJS) @inline(never) public static func bridgeJSLiftParameter() -> Wrapped? {
12891301
let isSome = _swift_js_pop_i32()
12901302
let pointer = _swift_js_pop_pointer()
12911303
return bridgeJSLiftParameter(isSome, pointer)

0 commit comments

Comments
 (0)