Skip to content

Commit 112a30e

Browse files
authored
Merge pull request #76923 from tshortli/fix-embedded-concurrency-warnings
Concurrency: Fix warnings in the runtime
2 parents bfbb9f8 + 0c09c6d commit 112a30e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

stdlib/public/Concurrency/Task.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,7 +1396,9 @@ namespace continuationChecking {
13961396

13971397
enum class State : uint8_t { Uninitialized, On, Off };
13981398

1399+
#if !SWIFT_CONCURRENCY_EMBEDDED
13991400
static std::atomic<State> CurrentState;
1401+
#endif
14001402

14011403
static LazyMutex ActiveContinuationsLock;
14021404
static Lazy<std::unordered_set<AsyncTask *>> ActiveContinuations;

stdlib/public/Concurrency/TaskGroup.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,13 +967,13 @@ static void swift_taskGroup_initializeImpl(TaskGroup *group, const Metadata *T)
967967
SWIFT_CC(swift)
968968
static void swift_taskGroup_initializeWithFlagsImpl(size_t rawGroupFlags,
969969
TaskGroup *group, const Metadata *T) {
970-
ResultTypeInfo resultType;
971970
#if !SWIFT_CONCURRENCY_EMBEDDED
971+
ResultTypeInfo resultType;
972972
resultType.metadata = T;
973+
_swift_taskGroup_initialize(resultType, rawGroupFlags, group);
973974
#else
974975
swift_unreachable("swift_taskGroup_initializeWithFlags in embedded");
975976
#endif
976-
_swift_taskGroup_initialize(resultType, rawGroupFlags, group);
977977
}
978978

979979
// Initializes into the preallocated _group an actual instance.

0 commit comments

Comments
 (0)