Skip to content

Don't abort on Linux if withLockIfAvailable() is called recursively. #85448

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
Nov 12, 2025
Merged

Don't abort on Linux if withLockIfAvailable() is called recursively. #85448

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
3 changes: 1 addition & 2 deletions stdlib/public/Synchronization/Mutex/LinuxImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@ extension _MutexHandle {

// EDEADLK - "The futex word at uaddr is already locked by the caller."
case 35:
// TODO: Replace with a colder function / one that takes a StaticString
fatalError("Attempt to try to lock Mutex in already acquired thread")
return false

// This handles all of the following errors which generally aren't
// applicable to this implementation:
Expand Down
6 changes: 0 additions & 6 deletions stdlib/public/Synchronization/Mutex/Mutex.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,6 @@ extension Mutex where Value: ~Copyable {
/// }
/// return try body(&value)
///
/// - Warning: Recursive calls to `withLockIfAvailable` within the
/// closure parameter has behavior that is platform dependent.
/// Some platforms may choose to panic the process, deadlock,
/// or leave this behavior unspecified. This will never
/// reacquire the lock however.
///
/// - Parameter body: A closure with a parameter of `Value`
/// that has exclusive access to the value being stored within
/// this mutex. This closure is considered the critical section
Expand Down