Skip to content

[Swift6] Fix TSan race condition in Swift6 SynchronizedDictionary #23091

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
4brunu merged 1 commit into from
Mar 3, 2026
+29 −29
Merged

[Swift6] Fix TSan race condition in Swift6 SynchronizedDictionary #23091

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
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/swift6/SynchronizedDictionary.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...generator/src/main/resources/swift6/libraries/alamofire/AlamofireImplementations.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable {
static let shared = AlamofireRequestBuilderConfiguration()

// Store manager to retain its reference
var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
let managerStore = SynchronizedDictionary<String, Alamofire.Session>()
}

{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class AlamofireRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...nerator/src/main/resources/swift6/libraries/urlsession/URLSessionImplementations.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...ft6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable {
static let shared = AlamofireRequestBuilderConfiguration()

// Store manager to retain its reference
var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
let managerStore = SynchronizedDictionary<String, Alamofire.Session>()
}

open class AlamofireRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...wift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fileprivate class AlamofireRequestBuilderConfiguration: @unchecked Sendable {
static let shared = AlamofireRequestBuilderConfiguration()

// Store manager to retain its reference
var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
let managerStore = SynchronizedDictionary<String, Alamofire.Session>()
}

open class AlamofireRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...ft6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...ift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...ferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...redLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion .../swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...ift6/combineLibrary/Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...etstore/swift6/default/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...tore/swift6/default/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion .../swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...ift6/objcCompatible/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion .../swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...ift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...isekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...kitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...ultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

internal class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...xswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...iftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...ift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
2 changes: 1 addition & 1 deletion ...t6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import Foundation

internal struct SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {
internal class SynchronizedDictionary<K: Hashable, V> : @unchecked Sendable {

private var dictionary = [K: V]()
private let lock = NSRecursiveLock()
Expand Down
2 changes: 1 addition & 1 deletion ...validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
let defaultURLSession: URLSession

// Store current URLCredential for every URLSessionTask
var credentialStore = SynchronizedDictionary<Int, URLCredential>()
let credentialStore = SynchronizedDictionary<Int, URLCredential>()
}

open class URLSessionRequestBuilder<T: Sendable>: RequestBuilder<T>, @unchecked Sendable {
Expand Down
Loading