This is an archive of the discontinued LLVM Phabricator instance.

Differential D154718

[libc++] Make sure we use __ulock on Apple platforms
ClosedPublic

Authored by ldionne on Jul 7 2023, 6:40 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGb5a9f9f6dc06: [libc++] Make sure we use __ulock on Apple platforms
Summary

We forgot to include the header, which means that _LIBCPP_USE_ULOCK was
always undefined and we'd always use the fallback. Note that this doesn't
seem to fix https://github.com/llvm/llvm-project/issues/63737.

Diff Detail

Event Timeline

ldionne created this revision.Jul 7 2023, 6:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 7 2023, 6:40 AM
ldionne requested review of this revision.Jul 7 2023, 6:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 7 2023, 6:40 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B243769: Diff 538129.Jul 7 2023, 8:07 AM
ldionne accepted this revision.Jul 7 2023, 2:15 PM
This revision is now accepted and ready to land.Jul 7 2023, 2:15 PM
Closed by commit rGb5a9f9f6dc06: [libc++] Make sure we use __ulock on Apple platforms (authored by ldionne). · Explain WhyJul 7 2023, 2:15 PM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGb5a9f9f6dc06: [libc++] Make sure we use __ulock on Apple platforms.

Revision Contents

PathSize
libcxx/
src/
2 lines

Diff 538267

libcxx/src/atomic.cpp

Show All 9 Lines
#ifndef _LIBCPP_HAS_NO_THREADS #ifndef _LIBCPP_HAS_NO_THREADS
#include <__thread/timed_backoff_policy.h> #include <__thread/timed_backoff_policy.h>
#include <atomic> #include <atomic>
#include <climits> #include <climits>
#include <functional> #include <functional>
#include <thread> #include <thread>
#include "include/apple_availability.h"
#ifdef __linux__ #ifdef __linux__
#include <unistd.h> #include <unistd.h>
#include <linux/futex.h> #include <linux/futex.h>
#include <sys/syscall.h> #include <sys/syscall.h>
// libc++ uses SYS_futex as a universal syscall name. However, on 32 bit architectures // libc++ uses SYS_futex as a universal syscall name. However, on 32 bit architectures
// with a 64 bit time_t, we need to specify SYS_futex_time64. // with a 64 bit time_t, we need to specify SYS_futex_time64.
▲ Show 20 Lines • Show All 196 Lines • Show Last 20 Lines