Skip to content

BridgeJS: Fix SwiftHeapObject finalization registry leaks and double release #648

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

BridgeJS: Fix SwiftHeapObject finalization registry leaks and double release #648

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: 18 additions & 8 deletions Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,33 @@ public struct BridgeJSLink {
"""

let swiftHeapObjectClassJs = """
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
"""
Expand Down
26 changes: 18 additions & 8 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,23 +355,33 @@ export async function createInstantiator(options, swift) {
/** @param {WebAssembly.Instance} instance */
createExports: (instance) => {
const js = swift.memory.heap;
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
class Item extends SwiftHeapObject {
Expand Down
26 changes: 18 additions & 8 deletions ...ins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,23 +295,33 @@ export async function createInstantiator(options, swift) {
/** @param {WebAssembly.Instance} instance */
createExports: (instance) => {
const js = swift.memory.heap;
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
class DefaultGreeter extends SwiftHeapObject {
Expand Down
26 changes: 18 additions & 8 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,23 +242,33 @@ export async function createInstantiator(options, swift) {
/** @param {WebAssembly.Instance} instance */
createExports: (instance) => {
const js = swift.memory.heap;
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
class Box extends SwiftHeapObject {
Expand Down
26 changes: 18 additions & 8 deletions ...s/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,23 +1042,33 @@ export async function createInstantiator(options, swift) {
/** @param {WebAssembly.Instance} instance */
createExports: (instance) => {
const js = swift.memory.heap;
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
class User extends SwiftHeapObject {
Expand Down
26 changes: 18 additions & 8 deletions .../BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,23 +267,33 @@ export async function createInstantiator(options, swift) {
/** @param {WebAssembly.Instance} instance */
createExports: (instance) => {
const js = swift.memory.heap;
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
class Converter extends SwiftHeapObject {
Expand Down
26 changes: 18 additions & 8 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,23 +248,33 @@ export async function createInstantiator(options, swift) {
/** @param {WebAssembly.Instance} instance */
createExports: (instance) => {
const js = swift.memory.heap;
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
class Converter extends SwiftHeapObject {
Expand Down
26 changes: 18 additions & 8 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,23 +343,33 @@ export async function createInstantiator(options, swift) {
/** @param {WebAssembly.Instance} instance */
createExports: (instance) => {
const js = swift.memory.heap;
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
class JSValueHolder extends SwiftHeapObject {
Expand Down
26 changes: 18 additions & 8 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,23 +215,33 @@ export async function createInstantiator(options, swift) {
/** @param {WebAssembly.Instance} instance */
createExports: (instance) => {
const js = swift.memory.heap;
const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {
if (state.hasReleased) {
return;
}
state.hasReleased = true;
state.deinit(state.pointer);
});

/// Represents a Swift heap object like a class instance or an actor instance.
class SwiftHeapObject {
static __wrap(pointer, deinit, prototype) {
const obj = Object.create(prototype);
const state = { pointer, deinit, hasReleased: false };
obj.pointer = pointer;
obj.hasReleased = false;
obj.deinit = deinit;
obj.registry = new FinalizationRegistry((pointer) => {
deinit(pointer);
});
obj.registry.register(this, obj.pointer);
obj.__swiftHeapObjectState = state;
swiftHeapObjectFinalizationRegistry.register(obj, state, state);
return obj;
}

release() {
this.registry.unregister(this);
this.deinit(this.pointer);
const state = this.__swiftHeapObjectState;
if (state.hasReleased) {
return;
}
state.hasReleased = true;
swiftHeapObjectFinalizationRegistry.unregister(state);
state.deinit(state.pointer);
}
}
class GlobalClass extends SwiftHeapObject {
Expand Down
Loading