Skip to content

Commit 1c6618e

Browse files
committedMay 24, 2022
[Threading] A few include tweaks.
The threading implementations need to include Impl.h, not just their specific variant, to pick up the `stack_bounds` type. Also fix a newly exposed problem with Atomic.h. rdar://90776105
1 parent a987cb9 commit 1c6618e

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed
 

‎include/swift/Runtime/Atomic.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "swift/Runtime/Config.h"
2121
#include <assert.h>
2222
#include <atomic>
23+
#include <cstdlib>
2324
#if defined(_WIN64)
2425
#include <intrin.h>
2526
#endif
@@ -48,7 +49,7 @@ namespace impl {
4849
///
4950
/// TODO: should we make this use non-atomic operations when the runtime
5051
/// is single-threaded?
51-
template <class Value, size_t Size = sizeof(Value)>
52+
template <class Value, std::size_t Size = sizeof(Value)>
5253
class alignas(Size) atomic_impl {
5354
std::atomic<Value> value;
5455
public:

‎lib/Threading/C11.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#if SWIFT_THREADING_C11
1818

19-
#include "swift/Threading/Impl/C11.h"
19+
#include "swift/Threading/Impl.h"
2020
#include "swift/Threading/Errors.h"
2121

2222
namespace {

‎lib/Threading/Linux.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#if SWIFT_THREADING_LINUX
1818

19-
#include "swift/Threading/Impl/Linux.h"
19+
#include "swift/Threading/Impl.h"
2020
#include "swift/Threading/Errors.h"
2121

2222
namespace {

‎lib/Threading/Pthreads.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <pthread_np.h>
2121
#endif
2222

23-
#include "swift/Threading/Impl/Pthreads.h"
23+
#include "swift/Threading/Impl.h"
2424
#include "swift/Threading/Errors.h"
2525

2626
namespace {

‎lib/Threading/Win32.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <windows.h>
2222

2323
#include "swift/Threading/Errors.h"
24-
#include "swift/Threading/Impl/Win32.h"
24+
#include "swift/Threading/Impl.h"
2525

2626
namespace {
2727

0 commit comments

Comments
 (0)