Skip to content

[NFC] BridgeJS: Remove tag stack and use i32 stack for enum case tags #620

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 1 commit into from
Feb 12, 2026
Merged

[NFC] BridgeJS: Remove tag stack and use i32 stack for enum case tags #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions Benchmarks/Sources/Generated/BridgeJS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum {
switch self {
case .success(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .failure(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .flag(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
case .rate(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(3))
_swift_js_push_i32(Int32(3))
case .precise(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(4))
_swift_js_push_i32(Int32(4))
case .info:
_swift_js_push_tag(Int32(5))
_swift_js_push_i32(Int32(5))
}
}
}
Expand Down Expand Up @@ -162,26 +162,26 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum {
switch self {
case .success(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .error(let param0, let param1):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .location(let param0, let param1, let param2):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
param2.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
case .status(let param0, let param1, let param2):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
param2.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(3))
_swift_js_push_i32(Int32(3))
case .coordinates(let param0, let param1, let param2):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
param2.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(4))
_swift_js_push_i32(Int32(4))
case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
Expand All @@ -192,9 +192,9 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum {
param6.bridgeJSLowerStackReturn()
param7.bridgeJSLowerStackReturn()
param8.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(5))
_swift_js_push_i32(Int32(5))
case .info:
_swift_js_push_tag(Int32(6))
_swift_js_push_i32(Int32(6))
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ struct EnumCodegen {
if enumCase.associatedValues.isEmpty {
printer.write("case .\(enumCase.name):")
printer.indent {
printer.write("_swift_js_push_tag(Int32(\(caseIndex)))")
printer.write("_swift_js_push_i32(Int32(\(caseIndex)))")
}
} else {
let pattern = enumCase.associatedValues.enumerated()
Expand All @@ -1334,7 +1334,7 @@ struct EnumCodegen {
generatePayloadPushingCode(printer: printer, associatedValues: enumCase.associatedValues)
// Push tag AFTER payloads so it's popped first (LIFO) by the JS lift function.
// This ensures nested enum tags don't overwrite the outer tag.
printer.write("_swift_js_push_tag(Int32(\(caseIndex)))")
printer.write("_swift_js_push_i32(Int32(\(caseIndex)))")
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ public struct BridgeJSLink {
"let \(JSGlueVariableScope.reservedStorageToReturnOptionalFloat);",
"let \(JSGlueVariableScope.reservedStorageToReturnOptionalDouble);",
"let \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);",
"let \(JSGlueVariableScope.reservedTagStack) = [];",
"let \(JSGlueVariableScope.reservedStringStack) = [];",
"let \(JSGlueVariableScope.reservedI32Stack) = [];",
"let \(JSGlueVariableScope.reservedF32Stack) = [];",
Expand Down Expand Up @@ -342,11 +341,6 @@ public struct BridgeJSLink {
printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(id);")
}
printer.write("}")
printer.write("bjs[\"swift_js_push_tag\"] = function(tag) {")
printer.indent {
printer.write("\(JSGlueVariableScope.reservedTagStack).push(tag);")
}
printer.write("}")
printer.write("bjs[\"swift_js_push_i32\"] = function(v) {")
printer.indent {
printer.write("\(JSGlueVariableScope.reservedI32Stack).push(v | 0);")
Expand Down
13 changes: 4 additions & 9 deletions Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ final class JSGlueVariableScope {
static let reservedStorageToReturnOptionalHeapObject = "tmpRetOptionalHeapObject"
static let reservedTextEncoder = "textEncoder"
static let reservedTextDecoder = "textDecoder"
static let reservedTagStack = "tagStack"
static let reservedStringStack = "strStack"
static let reservedI32Stack = "i32Stack"
static let reservedF32Stack = "f32Stack"
Expand Down Expand Up @@ -52,7 +51,6 @@ final class JSGlueVariableScope {
reservedStorageToReturnOptionalHeapObject,
reservedTextEncoder,
reservedTextDecoder,
reservedTagStack,
reservedStringStack,
reservedI32Stack,
reservedF32Stack,
Expand Down Expand Up @@ -122,9 +120,6 @@ extension JSGlueVariableScope {
func emitPushPointerReturn(_ value: String, printer: CodeFragmentPrinter) {
printer.write("\(JSGlueVariableScope.reservedPointerStack).push(\(value));")
}
func popTag() -> String {
return "\(JSGlueVariableScope.reservedTagStack).pop()"
}
func popString() -> String {
return "\(JSGlueVariableScope.reservedStringStack).pop()"
}
Expand Down Expand Up @@ -661,7 +656,7 @@ struct IntrinsicJSFragment: Sendable {
let (scope, printer) = (context.scope, context.printer)
let retName = scope.variable("ret")
printer.write(
"const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popTag()));"
"const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popI32()));"
)
return [retName]
}
Expand Down Expand Up @@ -1022,7 +1017,7 @@ struct IntrinsicJSFragment: Sendable {
case .associatedValueEnum(let fullName):
let base = fullName.components(separatedBy: ".").last ?? fullName
let tagVar = scope.variable("tag")
printer.write("const \(tagVar) = \(scope.popTag());")
printer.write("const \(tagVar) = \(scope.popI32());")
let isNullVar = scope.variable("isNull")
printer.write("const \(isNullVar) = (\(tagVar) === -1);")
printer.write("let \(resultVar);")
Expand Down Expand Up @@ -2112,7 +2107,7 @@ struct IntrinsicJSFragment: Sendable {
printer.write("if (\(isSomeVar)) {")
try printer.indent {
// For optional associated value enums, Swift uses bridgeJSLowerParameter()
// which pushes caseId to i32Stack (not tagStack like bridgeJSLowerReturn()).
// which pushes caseId to i32Stack (same as bridgeJSLowerReturn()).
if case .associatedValueEnum(let fullName) = wrappedType {
let base = fullName.components(separatedBy: ".").last ?? fullName
let caseIdVar = scope.variable("caseId")
Expand Down Expand Up @@ -2486,7 +2481,7 @@ struct IntrinsicJSFragment: Sendable {
let (scope, printer) = (context.scope, context.printer)
let resultVar = scope.variable("enumValue")
printer.write(
"const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTag()), );"
"const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popI32()), );"
)
return [resultVar]
}
Expand Down
74 changes: 37 additions & 37 deletions ...geJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum {
switch self {
case .success(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .failure(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .flag(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
case .rate(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(3))
_swift_js_push_i32(Int32(3))
case .precise(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(4))
_swift_js_push_i32(Int32(4))
case .info:
_swift_js_push_tag(Int32(5))
_swift_js_push_i32(Int32(5))
}
}
}
Expand Down Expand Up @@ -146,21 +146,21 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum {
switch self {
case .success(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .error(let param0, let param1):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .status(let param0, let param1, let param2):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
param2.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
case .coordinates(let param0, let param1, let param2):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
param2.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(3))
_swift_js_push_i32(Int32(3))
case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
Expand All @@ -171,9 +171,9 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum {
param6.bridgeJSLowerStackReturn()
param7.bridgeJSLowerStackReturn()
param8.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(4))
_swift_js_push_i32(Int32(4))
case .info:
_swift_js_push_tag(Int32(5))
_swift_js_push_i32(Int32(5))
}
}
}
Expand Down Expand Up @@ -225,16 +225,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum {
switch self {
case .success(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .failure(let param0, let param1):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .status(let param0, let param1, let param2):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
param2.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
}
}
}
Expand Down Expand Up @@ -279,11 +279,11 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum {
switch self {
case .success(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .failure(let param0, let param1):
param0.bridgeJSLowerStackReturn()
param1.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
}
}
}
Expand Down Expand Up @@ -363,7 +363,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum {
__bjs_unwrapped_param0.bridgeJSLowerStackReturn()
}
_swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0)
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .failure(let param0, let param1):
let __bjs_isSome_param0 = param0 != nil
if let __bjs_unwrapped_param0 = param0 {
Expand All @@ -375,7 +375,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum {
__bjs_unwrapped_param1.bridgeJSLowerStackReturn()
}
_swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0)
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .status(let param0, let param1, let param2):
let __bjs_isSome_param0 = param0 != nil
if let __bjs_unwrapped_param0 = param0 {
Expand All @@ -392,7 +392,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum {
__bjs_unwrapped_param2.bridgeJSLowerStackReturn()
}
_swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0)
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
}
}
}
Expand Down Expand Up @@ -504,26 +504,26 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum {
switch self {
case .precision(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .direction(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .optPrecision(let param0):
let __bjs_isSome_param0 = param0 != nil
if let __bjs_unwrapped_param0 = param0 {
__bjs_unwrapped_param0.bridgeJSLowerStackReturn()
}
_swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0)
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
case .optDirection(let param0):
let __bjs_isSome_param0 = param0 != nil
if let __bjs_unwrapped_param0 = param0 {
__bjs_unwrapped_param0.bridgeJSLowerStackReturn()
}
_swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0)
_swift_js_push_tag(Int32(3))
_swift_js_push_i32(Int32(3))
case .empty:
_swift_js_push_tag(Int32(4))
_swift_js_push_i32(Int32(4))
}
}
}
Expand Down Expand Up @@ -586,21 +586,21 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum {
switch self {
case .structPayload(let param0):
param0.bridgeJSLowerReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .classPayload(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .jsObjectPayload(let param0):
param0.bridgeJSLowerStackReturn()
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
case .nestedEnum(let param0):
param0.bridgeJSLowerReturn()
_swift_js_push_tag(Int32(3))
_swift_js_push_i32(Int32(3))
case .arrayPayload(let param0):
param0.bridgeJSLowerReturn()
_swift_js_push_tag(Int32(4))
_swift_js_push_i32(Int32(4))
case .empty:
_swift_js_push_tag(Int32(5))
_swift_js_push_i32(Int32(5))
}
}
}
Expand Down Expand Up @@ -675,33 +675,33 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum {
switch self {
case .optStruct(let param0):
param0.bridgeJSLowerReturn()
_swift_js_push_tag(Int32(0))
_swift_js_push_i32(Int32(0))
case .optClass(let param0):
let __bjs_isSome_param0 = param0 != nil
if let __bjs_unwrapped_param0 = param0 {
__bjs_unwrapped_param0.bridgeJSLowerStackReturn()
}
_swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0)
_swift_js_push_tag(Int32(1))
_swift_js_push_i32(Int32(1))
case .optJSObject(let param0):
let __bjs_isSome_param0 = param0 != nil
if let __bjs_unwrapped_param0 = param0 {
__bjs_unwrapped_param0.bridgeJSLowerStackReturn()
}
_swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0)
_swift_js_push_tag(Int32(2))
_swift_js_push_i32(Int32(2))
case .optNestedEnum(let param0):
let __bjs_isSome_param0 = param0 != nil
if let __bjs_unwrapped_param0 = param0 {
_swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter())
}
_swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0)
_swift_js_push_tag(Int32(3))
_swift_js_push_i32(Int32(3))
case .optArray(let param0):
param0.bridgeJSLowerReturn()
_swift_js_push_tag(Int32(4))
_swift_js_push_i32(Int32(4))
case .empty:
_swift_js_push_tag(Int32(5))
_swift_js_push_i32(Int32(5))
}
}
}
Expand Down
Loading