Skip to content

Commit 33c03e9

Browse files
krodakkrodak
authored
Merge pull request #675 from swiftwasm/pr-a70deeb0f5843a90772a69522fb9941ebaf3ac11
BridgeJS: Remove inline array lifting/lowering codegen
2 parents 3badf17 + 1746d97 commit 33c03e9

5 files changed

Lines changed: 41 additions & 321 deletions

File tree

‎Benchmarks/Sources/Generated/BridgeJS.swift‎

Lines changed: 8 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,16 +1578,7 @@ public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutable
15781578
@_cdecl("bjs_ArrayRoundtrip_takeOptionalIntArray")
15791579
public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void {
15801580
#if arch(wasm32)
1581-
ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalIntArray(_: {
1582-
let __count = Int(_swift_js_pop_i32())
1583-
var __result: [Optional<Int>] = []
1584-
__result.reserveCapacity(__count)
1585-
for _ in 0..<__count {
1586-
__result.append(Optional<Int>.bridgeJSStackPop())
1587-
}
1588-
__result.reverse()
1589-
return __result
1590-
}())
1581+
ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalIntArray(_: [Optional<Int>].bridgeJSStackPop())
15911582
#else
15921583
fatalError("Only available on WebAssembly")
15931584
#endif
@@ -1598,10 +1589,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPo
15981589
public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void {
15991590
#if arch(wasm32)
16001591
let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalIntArray()
1601-
for __bjs_elem_ret in ret {
1602-
__bjs_elem_ret.bridgeJSStackPush()
1603-
}
1604-
_swift_js_push_i32(Int32(ret.count))
1592+
ret.bridgeJSStackPush()
16051593
#else
16061594
fatalError("Only available on WebAssembly")
16071595
#endif
@@ -1611,20 +1599,8 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo
16111599
@_cdecl("bjs_ArrayRoundtrip_roundtripOptionalIntArray")
16121600
public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void {
16131601
#if arch(wasm32)
1614-
let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalIntArray(_: {
1615-
let __count = Int(_swift_js_pop_i32())
1616-
var __result: [Optional<Int>] = []
1617-
__result.reserveCapacity(__count)
1618-
for _ in 0..<__count {
1619-
__result.append(Optional<Int>.bridgeJSStackPop())
1620-
}
1621-
__result.reverse()
1622-
return __result
1623-
}())
1624-
for __bjs_elem_ret in ret {
1625-
__bjs_elem_ret.bridgeJSStackPush()
1626-
}
1627-
_swift_js_push_i32(Int32(ret.count))
1602+
let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalIntArray(_: [Optional<Int>].bridgeJSStackPop())
1603+
ret.bridgeJSStackPush()
16281604
#else
16291605
fatalError("Only available on WebAssembly")
16301606
#endif
@@ -1634,16 +1610,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable
16341610
@_cdecl("bjs_ArrayRoundtrip_takeOptionalPointArray")
16351611
public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void {
16361612
#if arch(wasm32)
1637-
ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalPointArray(_: {
1638-
let __count = Int(_swift_js_pop_i32())
1639-
var __result: [Optional<Point>] = []
1640-
__result.reserveCapacity(__count)
1641-
for _ in 0..<__count {
1642-
__result.append(Optional<Point>.bridgeJSStackPop())
1643-
}
1644-
__result.reverse()
1645-
return __result
1646-
}())
1613+
ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalPointArray(_: [Optional<Point>].bridgeJSStackPop())
16471614
#else
16481615
fatalError("Only available on WebAssembly")
16491616
#endif
@@ -1654,10 +1621,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRaw
16541621
public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void {
16551622
#if arch(wasm32)
16561623
let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalPointArray()
1657-
for __bjs_elem_ret in ret {
1658-
__bjs_elem_ret.bridgeJSStackPush()
1659-
}
1660-
_swift_js_push_i32(Int32(ret.count))
1624+
ret.bridgeJSStackPush()
16611625
#else
16621626
fatalError("Only available on WebAssembly")
16631627
#endif
@@ -1667,20 +1631,8 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw
16671631
@_cdecl("bjs_ArrayRoundtrip_roundtripOptionalPointArray")
16681632
public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void {
16691633
#if arch(wasm32)
1670-
let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalPointArray(_: {
1671-
let __count = Int(_swift_js_pop_i32())
1672-
var __result: [Optional<Point>] = []
1673-
__result.reserveCapacity(__count)
1674-
for _ in 0..<__count {
1675-
__result.append(Optional<Point>.bridgeJSStackPop())
1676-
}
1677-
__result.reverse()
1678-
return __result
1679-
}())
1680-
for __bjs_elem_ret in ret {
1681-
__bjs_elem_ret.bridgeJSStackPush()
1682-
}
1683-
_swift_js_push_i32(Int32(ret.count))
1634+
let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalPointArray(_: [Optional<Point>].bridgeJSStackPop())
1635+
ret.bridgeJSStackPush()
16841636
#else
16851637
fatalError("Only available on WebAssembly")
16861638
#endif

‎Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift‎

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -713,14 +713,12 @@ struct StackCodegen {
713713
switch type {
714714
case .string, .int, .uint, .bool, .float, .double,
715715
.jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject, .unsafePointer,
716-
.swiftProtocol, .caseEnum, .associatedValueEnum, .rawValueEnum:
716+
.swiftProtocol, .caseEnum, .associatedValueEnum, .rawValueEnum, .array:
717717
return "\(raw: type.swiftType).bridgeJSStackPop()"
718718
case .jsObject(let className?):
719719
return "\(raw: className)(unsafelyWrapping: JSObject.bridgeJSStackPop())"
720720
case .nullable(let wrappedType, let kind):
721721
return liftNullableExpression(wrappedType: wrappedType, kind: kind)
722-
case .array(let elementType):
723-
return liftArrayExpression(elementType: elementType)
724722
case .dictionary(let valueType):
725723
return liftDictionaryExpression(valueType: valueType)
726724
case .closure:
@@ -730,36 +728,6 @@ struct StackCodegen {
730728
}
731729
}
732730

733-
func liftArrayExpression(elementType: BridgeType) -> ExprSyntax {
734-
switch elementType {
735-
case .jsObject(let className?) where className != "JSObject":
736-
return "[JSObject].bridgeJSStackPop().map { \(raw: className)(unsafelyWrapping: $0) }"
737-
case .nullable, .closure:
738-
return liftArrayExpressionInline(elementType: elementType)
739-
case .void, .namespaceEnum:
740-
fatalError("Invalid array element type: \(elementType)")
741-
default:
742-
return "[\(raw: elementType.swiftType)].bridgeJSStackPop()"
743-
}
744-
}
745-
746-
private func liftArrayExpressionInline(elementType: BridgeType) -> ExprSyntax {
747-
let elementLift = liftExpression(for: elementType)
748-
let swiftTypeName = elementType.swiftType
749-
return """
750-
{
751-
let __count = Int(_swift_js_pop_i32())
752-
var __result: [\(raw: swiftTypeName)] = []
753-
__result.reserveCapacity(__count)
754-
for _ in 0..<__count {
755-
__result.append(\(elementLift))
756-
}
757-
__result.reverse()
758-
return __result
759-
}()
760-
"""
761-
}
762-
763731
func liftDictionaryExpression(valueType: BridgeType) -> ExprSyntax {
764732
switch valueType {
765733
case .jsObject(let className?) where className != "JSObject":
@@ -845,47 +813,15 @@ struct StackCodegen {
845813
varPrefix: String
846814
) -> [CodeBlockItemSyntax] {
847815
switch elementType {
848-
case .jsObject(let className?) where className != "JSObject":
849-
return ["\(raw: accessor).map { $0.jsObject }.bridgeJSStackPush()"]
850816
case .swiftProtocol:
851817
return ["\(raw: accessor).map { $0 as! \(raw: elementType.swiftType) }.bridgeJSStackPush()"]
852-
case .nullable, .closure:
853-
return lowerArrayStatementsInline(
854-
elementType: elementType,
855-
accessor: accessor,
856-
varPrefix: varPrefix
857-
)
858818
case .void, .namespaceEnum:
859819
fatalError("Invalid array element type: \(elementType)")
860820
default:
861821
return ["\(raw: accessor).bridgeJSStackPush()"]
862822
}
863823
}
864824

865-
private func lowerArrayStatementsInline(
866-
elementType: BridgeType,
867-
accessor: String,
868-
varPrefix: String
869-
) -> [CodeBlockItemSyntax] {
870-
var statements: [String] = []
871-
let elementVarName = "__bjs_elem_\(varPrefix)"
872-
statements.append("for \(elementVarName) in \(accessor) {")
873-
874-
let elementStatements = lowerStatements(
875-
for: elementType,
876-
accessor: elementVarName,
877-
varPrefix: "\(varPrefix)_elem"
878-
)
879-
for stmt in elementStatements {
880-
statements.append(stmt.description)
881-
}
882-
883-
statements.append("}")
884-
statements.append("_swift_js_push_i32(Int32(\(accessor).count))")
885-
let parsed: CodeBlockItemListSyntax = "\(raw: statements.joined(separator: "\n"))"
886-
return Array(parsed)
887-
}
888-
889825
private func lowerDictionaryStatements(
890826
valueType: BridgeType,
891827
accessor: String,

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift‎

Lines changed: 12 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -228,20 +228,8 @@ public func _bjs_processOpaquePointerArray() -> Void {
228228
@_cdecl("bjs_processOptionalIntArray")
229229
public func _bjs_processOptionalIntArray() -> Void {
230230
#if arch(wasm32)
231-
let ret = processOptionalIntArray(_: {
232-
let __count = Int(_swift_js_pop_i32())
233-
var __result: [Optional<Int>] = []
234-
__result.reserveCapacity(__count)
235-
for _ in 0..<__count {
236-
__result.append(Optional<Int>.bridgeJSStackPop())
237-
}
238-
__result.reverse()
239-
return __result
240-
}())
241-
for __bjs_elem_ret in ret {
242-
__bjs_elem_ret.bridgeJSStackPush()
243-
}
244-
_swift_js_push_i32(Int32(ret.count))
231+
let ret = processOptionalIntArray(_: [Optional<Int>].bridgeJSStackPop())
232+
ret.bridgeJSStackPush()
245233
#else
246234
fatalError("Only available on WebAssembly")
247235
#endif
@@ -251,20 +239,8 @@ public func _bjs_processOptionalIntArray() -> Void {
251239
@_cdecl("bjs_processOptionalStringArray")
252240
public func _bjs_processOptionalStringArray() -> Void {
253241
#if arch(wasm32)
254-
let ret = processOptionalStringArray(_: {
255-
let __count = Int(_swift_js_pop_i32())
256-
var __result: [Optional<String>] = []
257-
__result.reserveCapacity(__count)
258-
for _ in 0..<__count {
259-
__result.append(Optional<String>.bridgeJSStackPop())
260-
}
261-
__result.reverse()
262-
return __result
263-
}())
264-
for __bjs_elem_ret in ret {
265-
__bjs_elem_ret.bridgeJSStackPush()
266-
}
267-
_swift_js_push_i32(Int32(ret.count))
242+
let ret = processOptionalStringArray(_: [Optional<String>].bridgeJSStackPop())
243+
ret.bridgeJSStackPush()
268244
#else
269245
fatalError("Only available on WebAssembly")
270246
#endif
@@ -285,20 +261,8 @@ public func _bjs_processOptionalArray() -> Void {
285261
@_cdecl("bjs_processOptionalPointArray")
286262
public func _bjs_processOptionalPointArray() -> Void {
287263
#if arch(wasm32)
288-
let ret = processOptionalPointArray(_: {
289-
let __count = Int(_swift_js_pop_i32())
290-
var __result: [Optional<Point>] = []
291-
__result.reserveCapacity(__count)
292-
for _ in 0..<__count {
293-
__result.append(Optional<Point>.bridgeJSStackPop())
294-
}
295-
__result.reverse()
296-
return __result
297-
}())
298-
for __bjs_elem_ret in ret {
299-
__bjs_elem_ret.bridgeJSStackPush()
300-
}
301-
_swift_js_push_i32(Int32(ret.count))
264+
let ret = processOptionalPointArray(_: [Optional<Point>].bridgeJSStackPop())
265+
ret.bridgeJSStackPush()
302266
#else
303267
fatalError("Only available on WebAssembly")
304268
#endif
@@ -308,20 +272,8 @@ public func _bjs_processOptionalPointArray() -> Void {
308272
@_cdecl("bjs_processOptionalDirectionArray")
309273
public func _bjs_processOptionalDirectionArray() -> Void {
310274
#if arch(wasm32)
311-
let ret = processOptionalDirectionArray(_: {
312-
let __count = Int(_swift_js_pop_i32())
313-
var __result: [Optional<Direction>] = []
314-
__result.reserveCapacity(__count)
315-
for _ in 0..<__count {
316-
__result.append(Optional<Direction>.bridgeJSStackPop())
317-
}
318-
__result.reverse()
319-
return __result
320-
}())
321-
for __bjs_elem_ret in ret {
322-
__bjs_elem_ret.bridgeJSStackPush()
323-
}
324-
_swift_js_push_i32(Int32(ret.count))
275+
let ret = processOptionalDirectionArray(_: [Optional<Direction>].bridgeJSStackPop())
276+
ret.bridgeJSStackPush()
325277
#else
326278
fatalError("Only available on WebAssembly")
327279
#endif
@@ -331,20 +283,8 @@ public func _bjs_processOptionalDirectionArray() -> Void {
331283
@_cdecl("bjs_processOptionalStatusArray")
332284
public func _bjs_processOptionalStatusArray() -> Void {
333285
#if arch(wasm32)
334-
let ret = processOptionalStatusArray(_: {
335-
let __count = Int(_swift_js_pop_i32())
336-
var __result: [Optional<Status>] = []
337-
__result.reserveCapacity(__count)
338-
for _ in 0..<__count {
339-
__result.append(Optional<Status>.bridgeJSStackPop())
340-
}
341-
__result.reverse()
342-
return __result
343-
}())
344-
for __bjs_elem_ret in ret {
345-
__bjs_elem_ret.bridgeJSStackPush()
346-
}
347-
_swift_js_push_i32(Int32(ret.count))
286+
let ret = processOptionalStatusArray(_: [Optional<Status>].bridgeJSStackPop())
287+
ret.bridgeJSStackPush()
348288
#else
349289
fatalError("Only available on WebAssembly")
350290
#endif
@@ -420,20 +360,8 @@ public func _bjs_processJSObjectArray() -> Void {
420360
@_cdecl("bjs_processOptionalJSObjectArray")
421361
public func _bjs_processOptionalJSObjectArray() -> Void {
422362
#if arch(wasm32)
423-
let ret = processOptionalJSObjectArray(_: {
424-
let __count = Int(_swift_js_pop_i32())
425-
var __result: [Optional<JSObject>] = []
426-
__result.reserveCapacity(__count)
427-
for _ in 0..<__count {
428-
__result.append(Optional<JSObject>.bridgeJSStackPop())
429-
}
430-
__result.reverse()
431-
return __result
432-
}())
433-
for __bjs_elem_ret in ret {
434-
__bjs_elem_ret.bridgeJSStackPush()
435-
}
436-
_swift_js_push_i32(Int32(ret.count))
363+
let ret = processOptionalJSObjectArray(_: [Optional<JSObject>].bridgeJSStackPop())
364+
ret.bridgeJSStackPush()
437365
#else
438366
fatalError("Only available on WebAssembly")
439367
#endif

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public func _bjs_makeFoo() -> Int32 {
7575
@_cdecl("bjs_processFooArray")
7676
public func _bjs_processFooArray() -> Void {
7777
#if arch(wasm32)
78-
let ret = processFooArray(_: [JSObject].bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) })
79-
ret.map { $0.jsObject }.bridgeJSStackPush()
78+
let ret = processFooArray(_: [Foo].bridgeJSStackPop())
79+
ret.bridgeJSStackPush()
8080
#else
8181
fatalError("Only available on WebAssembly")
8282
#endif
@@ -86,20 +86,8 @@ public func _bjs_processFooArray() -> Void {
8686
@_cdecl("bjs_processOptionalFooArray")
8787
public func _bjs_processOptionalFooArray() -> Void {
8888
#if arch(wasm32)
89-
let ret = processOptionalFooArray(_: {
90-
let __count = Int(_swift_js_pop_i32())
91-
var __result: [Optional<Foo>] = []
92-
__result.reserveCapacity(__count)
93-
for _ in 0..<__count {
94-
__result.append(Optional<JSObject>.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) })
95-
}
96-
__result.reverse()
97-
return __result
98-
}())
99-
for __bjs_elem_ret in ret {
100-
__bjs_elem_ret.bridgeJSStackPush()
101-
}
102-
_swift_js_push_i32(Int32(ret.count))
89+
let ret = processOptionalFooArray(_: [Optional<Foo>].bridgeJSStackPop())
90+
ret.bridgeJSStackPush()
10391
#else
10492
fatalError("Only available on WebAssembly")
10593
#endif

0 commit comments

Comments
 (0)