Skip to content

[BridgeJS] Formalizing ABI Part 1 #553

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

Merged
krodak merged 4 commits into from
Feb 2, 2026
+1,050 −1,486
Merged

[BridgeJS] Formalizing ABI Part 1 #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9c0301
BridgeJS: Rename stack manipulation imports
kateinoigakukun Feb 2, 2026
dbc216a
BridgeJS: Remove `swift_js_pop_array_length`
kateinoigakukun Feb 2, 2026
8c82550
BridgeJS: Remove `swift_js_push_array_length`
kateinoigakukun Feb 2, 2026
e604fa6
BridgeJS: Rename swift_js_push_int -> swift_js_push_i32
kateinoigakukun Feb 2, 2026
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
266 changes: 133 additions & 133 deletions Benchmarks/Sources/Generated/BridgeJS.swift
View file
Open in desktop

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,41 +799,41 @@ struct StackCodegen {
func liftExpression(for type: BridgeType) -> ExprSyntax {
switch type {
case .string:
return "String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
return "String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
case .int, .uint:
return "Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "Int.bridgeJSLiftParameter(_swift_js_pop_i32())"
case .bool:
return "Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "Bool.bridgeJSLiftParameter(_swift_js_pop_i32())"
case .float:
return "Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())"
return "Float.bridgeJSLiftParameter(_swift_js_pop_f32())"
case .double:
return "Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())"
return "Double.bridgeJSLiftParameter(_swift_js_pop_f64())"
case .jsObject:
return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "JSObject.bridgeJSLiftParameter(_swift_js_pop_i32())"
case .swiftHeapObject(let className):
return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_param_pointer())"
return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_pointer())"
case .unsafePointer:
return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_param_pointer())"
return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_pointer())"
case .swiftProtocol(let protocolName):
// Protocols use their Any wrapper type for lifting
let wrapperName = "Any\(protocolName)"
return "\(raw: wrapperName).bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "\(raw: wrapperName).bridgeJSLiftParameter(_swift_js_pop_i32())"
case .caseEnum(let enumName):
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())"
case .rawValueEnum(let enumName, let rawType):
switch rawType {
case .string:
return
"\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
"\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
case .float:
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_f32())"
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_f32())"
case .double:
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_f64())"
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_f64())"
case .bool, .int, .int32, .int64, .uint, .uint32, .uint64:
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())"
}
case .associatedValueEnum(let enumName):
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())"
case .swiftStruct(let structName):
return "\(raw: structName).bridgeJSLiftParameter()"
case .optional(let wrappedType):
Expand All @@ -845,7 +845,7 @@ struct StackCodegen {
// Namespace enums are not passed as values
return "()"
case .closure:
return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "JSObject.bridgeJSLiftParameter(_swift_js_pop_i32())"
case .array(let elementType):
return liftArrayExpression(elementType: elementType)
}
Expand All @@ -856,7 +856,7 @@ struct StackCodegen {
let swiftTypeName = elementType.swiftType
return """
{
let __count = Int(_swift_js_pop_param_array_length())
let __count = Int(_swift_js_pop_i32())
var __result: [\(raw: swiftTypeName)] = []
__result.reserveCapacity(__count)
for _ in 0..<__count {
Expand All @@ -872,49 +872,49 @@ struct StackCodegen {
switch wrappedType {
case .string:
return
"Optional<String>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
"Optional<String>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())"
case .int, .uint:
return "Optional<Int>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
return "Optional<Int>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
case .bool:
return "Optional<Bool>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
return "Optional<Bool>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
case .float:
return "Optional<Float>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())"
return "Optional<Float>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32())"
case .double:
return "Optional<Double>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())"
return "Optional<Double>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64())"
case .caseEnum(let enumName):
return
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
case .rawValueEnum(let enumName, let rawType):
switch rawType {
case .string:
return
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())"
case .float:
return
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())"
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32())"
case .double:
return
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())"
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64())"
case .bool, .int, .int32, .int64, .uint, .uint32, .uint64:
return
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
}
case .swiftStruct(let nestedName):
return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_i32())"
case .swiftHeapObject(let className):
return
"Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_pointer())"
"Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_pointer())"
case .associatedValueEnum(let enumName):
return
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
case .jsObject:
return "Optional<JSObject>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
return "Optional<JSObject>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
case .array(let elementType):
let arrayLift = liftArrayExpression(elementType: elementType)
let swiftTypeName = elementType.swiftType
return """
{
let __isSome = _swift_js_pop_param_int32()
let __isSome = _swift_js_pop_i32()
if __isSome == 0 {
return Optional<[\(raw: swiftTypeName)]>.none
} else {
Expand All @@ -924,7 +924,7 @@ struct StackCodegen {
"""
default:
// Fallback for other optional types
return "Optional<Int>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
return "Optional<Int>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
}
}

Expand All @@ -946,24 +946,24 @@ struct StackCodegen {
"__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }",
]
case .int, .uint:
return ["_swift_js_push_int(Int32(\(raw: accessor)))"]
return ["_swift_js_push_i32(Int32(\(raw: accessor)))"]
case .bool:
return ["_swift_js_push_int(\(raw: accessor) ? 1 : 0)"]
return ["_swift_js_push_i32(\(raw: accessor) ? 1 : 0)"]
case .float:
return ["_swift_js_push_f32(\(raw: accessor))"]
case .double:
return ["_swift_js_push_f64(\(raw: accessor))"]
case .jsObject:
return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerReturn())"]
return ["_swift_js_push_i32(\(raw: accessor).bridgeJSLowerReturn())"]
case .swiftHeapObject:
return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"]
case .unsafePointer:
return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"]
case .swiftProtocol(let protocolName):
let wrapperName = "Any\(protocolName)"
return ["_swift_js_push_int((\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerReturn())"]
return ["_swift_js_push_i32((\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerReturn())"]
case .caseEnum:
return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"]
return ["_swift_js_push_i32(Int32(\(raw: accessor).bridgeJSLowerParameter()))"]
case .rawValueEnum(_, let rawType):
switch rawType {
case .string:
Expand All @@ -976,7 +976,7 @@ struct StackCodegen {
case .double:
return ["_swift_js_push_f64(\(raw: accessor).bridgeJSLowerParameter())"]
default:
return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"]
return ["_swift_js_push_i32(Int32(\(raw: accessor).bridgeJSLowerParameter()))"]
}
case .associatedValueEnum:
return ["\(raw: accessor).bridgeJSLowerReturn()"]
Expand Down Expand Up @@ -1014,7 +1014,7 @@ struct StackCodegen {
}

statements.append("}")
statements.append("_swift_js_push_array_length(Int32(\(raw: accessor).count))")
statements.append("_swift_js_push_i32(Int32(\(raw: accessor).count))")
return statements
}

Expand All @@ -1037,7 +1037,7 @@ struct StackCodegen {
}

statements.append("}")
statements.append("_swift_js_push_int(__bjs_isSome_\(raw: varPrefix) ? 1 : 0)")
statements.append("_swift_js_push_i32(__bjs_isSome_\(raw: varPrefix) ? 1 : 0)")
return statements
}

Expand All @@ -1053,15 +1053,15 @@ struct StackCodegen {
"__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }",
]
case .int, .uint:
return ["_swift_js_push_int(Int32(\(raw: unwrappedVar)))"]
return ["_swift_js_push_i32(Int32(\(raw: unwrappedVar)))"]
case .bool:
return ["_swift_js_push_int(\(raw: unwrappedVar) ? 1 : 0)"]
return ["_swift_js_push_i32(\(raw: unwrappedVar) ? 1 : 0)"]
case .float:
return ["_swift_js_push_f32(\(raw: unwrappedVar))"]
case .double:
return ["_swift_js_push_f64(\(raw: unwrappedVar))"]
case .caseEnum:
return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"]
return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"]
case .rawValueEnum(_, let rawType):
switch rawType {
case .string:
Expand All @@ -1074,16 +1074,16 @@ struct StackCodegen {
case .double:
return ["_swift_js_push_f64(\(raw: unwrappedVar).bridgeJSLowerParameter())"]
default:
return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"]
return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"]
}
case .swiftStruct:
return ["\(raw: unwrappedVar).bridgeJSLowerReturn()"]
case .swiftHeapObject:
return ["_swift_js_push_pointer(\(raw: unwrappedVar).bridgeJSLowerReturn())"]
case .associatedValueEnum:
return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"]
return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"]
case .jsObject:
return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerReturn())"]
return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerReturn())"]
case .array(let elementType):
return lowerArrayStatements(elementType: elementType, accessor: unwrappedVar, varPrefix: varPrefix)
default:
Expand Down
22 changes: 5 additions & 17 deletions Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,6 @@ public struct BridgeJSLink {
"let \(JSGlueVariableScope.reservedTmpRetPointers) = [];",
"let \(JSGlueVariableScope.reservedTmpParamPointers) = [];",
"let \(JSGlueVariableScope.reservedTmpStructCleanups) = [];",
"let \(JSGlueVariableScope.reservedTmpRetArrayLengths) = [];",
"let \(JSGlueVariableScope.reservedTmpParamArrayLengths) = [];",
"const \(JSGlueVariableScope.reservedEnumHelpers) = {};",
"const \(JSGlueVariableScope.reservedStructHelpers) = {};",
"",
Expand Down Expand Up @@ -392,7 +390,7 @@ public struct BridgeJSLink {
printer.write("\(JSGlueVariableScope.reservedTmpRetTag) = tag;")
}
printer.write("}")
printer.write("bjs[\"swift_js_push_int\"] = function(v) {")
printer.write("bjs[\"swift_js_push_i32\"] = function(v) {")
printer.indent {
printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(v | 0);")
}
Expand All @@ -416,17 +414,17 @@ public struct BridgeJSLink {
printer.write("\(JSGlueVariableScope.reservedTmpRetStrings).push(value);")
}
printer.write("}")
printer.write("bjs[\"swift_js_pop_param_int32\"] = function() {")
printer.write("bjs[\"swift_js_pop_i32\"] = function() {")
printer.indent {
printer.write("return \(JSGlueVariableScope.reservedTmpParamInts).pop();")
}
printer.write("}")
printer.write("bjs[\"swift_js_pop_param_f32\"] = function() {")
printer.write("bjs[\"swift_js_pop_f32\"] = function() {")
printer.indent {
printer.write("return \(JSGlueVariableScope.reservedTmpParamF32s).pop();")
}
printer.write("}")
printer.write("bjs[\"swift_js_pop_param_f64\"] = function() {")
printer.write("bjs[\"swift_js_pop_f64\"] = function() {")
printer.indent {
printer.write("return \(JSGlueVariableScope.reservedTmpParamF64s).pop();")
}
Expand All @@ -436,21 +434,11 @@ public struct BridgeJSLink {
printer.write("\(JSGlueVariableScope.reservedTmpRetPointers).push(pointer);")
}
printer.write("}")
printer.write("bjs[\"swift_js_pop_param_pointer\"] = function() {")
printer.write("bjs[\"swift_js_pop_pointer\"] = function() {")
printer.indent {
printer.write("return \(JSGlueVariableScope.reservedTmpParamPointers).pop();")
}
printer.write("}")
printer.write("bjs[\"swift_js_push_array_length\"] = function(len) {")
printer.indent {
printer.write("\(JSGlueVariableScope.reservedTmpRetArrayLengths).push(len | 0);")
}
printer.write("}")
printer.write("bjs[\"swift_js_pop_param_array_length\"] = function() {")
printer.indent {
printer.write("return \(JSGlueVariableScope.reservedTmpParamArrayLengths).pop();")
}
printer.write("}")
printer.write("bjs[\"swift_js_struct_cleanup\"] = function(cleanupId) {")
printer.indent {
printer.write("if (cleanupId === 0) { return; }")
Expand Down
8 changes: 2 additions & 6 deletions Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ final class JSGlueVariableScope {
static let reservedTmpRetPointers = "tmpRetPointers"
static let reservedTmpParamPointers = "tmpParamPointers"
static let reservedTmpStructCleanups = "tmpStructCleanups"
static let reservedTmpRetArrayLengths = "tmpRetArrayLengths"
static let reservedTmpParamArrayLengths = "tmpParamArrayLengths"
static let reservedEnumHelpers = "enumHelpers"
static let reservedStructHelpers = "structHelpers"

Expand Down Expand Up @@ -62,8 +60,6 @@ final class JSGlueVariableScope {
reservedTmpRetPointers,
reservedTmpParamPointers,
reservedTmpStructCleanups,
reservedTmpRetArrayLengths,
reservedTmpParamArrayLengths,
reservedEnumHelpers,
reservedStructHelpers,
]
Expand Down Expand Up @@ -2172,7 +2168,7 @@ struct IntrinsicJSFragment: Sendable {
}
}
printer.write("}")
printer.write("\(JSGlueVariableScope.reservedTmpParamArrayLengths).push(\(arr).length);")
printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(arr).length);")
cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }")
return []
}
Expand All @@ -2188,7 +2184,7 @@ struct IntrinsicJSFragment: Sendable {
let lenVar = scope.variable("arrayLen")
let iVar = scope.variable("i")

printer.write("const \(lenVar) = \(JSGlueVariableScope.reservedTmpRetArrayLengths).pop();")
printer.write("const \(lenVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();")
printer.write("const \(resultVar) = [];")
printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {")
printer.indent {
Expand Down
Loading