Skip to content

Fix preprocessor logic error in pthread_mutex_trylock.c. NFC #26753

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
sbc100 merged 1 commit into from
Apr 22, 2026
+12 −12
Merged

Fix preprocessor logic error in pthread_mutex_trylock.c. NFC #26753

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
8 changes: 4 additions & 4 deletions system/lib/libc/musl/src/thread/pthread_mutex_trylock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
}
#endif

#if defined(__EMSCRIPTEN__) || !defined(NDEBUG)
// We can get here for normal mutexes too, but only in debug builds
// (where we track ownership purely for debug purposes).
if ((type & 15) == PTHREAD_MUTEX_NORMAL) return 0;
#if defined(__EMSCRIPTEN__) && !defined(NDEBUG)
// Under emscripten we can get here for normal mutexes too, but only in debug
// Jbuilds (where we track ownership purely for debug purposes).
Copy link
Copy Markdown
Member

@kripken kripken Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Jbuilds (where we track ownership purely for debug purposes).
// builds (where we track ownership purely for debug purposes).

Copy link
Copy Markdown
Collaborator Author

@sbc100 sbc100 Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, will fix in followup.

if ((type&15) == PTHREAD_MUTEX_NORMAL) return 0;
#endif

next = self->robust_list.head;
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_minimal_pthreads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 7323,
"a.out.js.gz": 3573,
"a.out.nodebug.wasm": 19065,
"a.out.nodebug.wasm.gz": 8807,
"total": 26388,
"total_gz": 12380,
"a.out.nodebug.wasm": 19053,
"a.out.nodebug.wasm.gz": 8794,
"total": 26376,
"total_gz": 12367,
"sent": [
"a (memory)",
"b (exit)",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_minimal_pthreads_memgrowth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 7726,
"a.out.js.gz": 3779,
"a.out.nodebug.wasm": 19066,
"a.out.nodebug.wasm.gz": 8808,
"total": 26792,
"total_gz": 12587,
"a.out.nodebug.wasm": 19054,
"a.out.nodebug.wasm.gz": 8796,
"total": 26780,
"total_gz": 12575,
"sent": [
"a (memory)",
"b (exit)",
Expand Down
Loading