Skip to content

Workaround Swift 6.0 compiler crash #293

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
merged 1 commit into from
Mar 13, 2025
Merged

Workaround Swift 6.0 compiler crash #293

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
12 changes: 9 additions & 3 deletions Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,18 @@ public class JSOneshotClosure: JSObject, JSClosureProtocol {
public class JSClosure: JSFunction, JSClosureProtocol {

class SharedJSClosure {
private var storage: [JavaScriptHostFuncRef: (object: JSObject, body: (sending [JSValue]) -> JSValue)] = [:]
// Note: 6.0 compilers built with assertions enabled crash when calling
// `removeValue(forKey:)` on a dictionary with value type containing
// `sending`. Wrap the value type with a struct to avoid the crash.
struct Entry {
let item: (object: JSObject, body: (sending [JSValue]) -> JSValue)
}
private var storage: [JavaScriptHostFuncRef: Entry] = [:]
init() {}

subscript(_ key: JavaScriptHostFuncRef) -> (object: JSObject, body: (sending [JSValue]) -> JSValue)? {
get { storage[key] }
set { storage[key] = newValue }
get { storage[key]?.item }
set { storage[key] = newValue.map { Entry(item: $0) } }
}
}

Expand Down