Skip to content

Commit e85b461

Browse files
authored
Merge pull request swiftlang#74568 from ktoso/wip-remove-old-clang-workaround
[Concurrency] Remove OPTNONE workaround for old clang version
2 parents 174983f + a43abe6 commit e85b461

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

include/swift/Runtime/Config.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,6 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
220220
#define SWIFT_ASYNC_CONTEXT
221221
#endif
222222

223-
#if __has_attribute(optnone)
224-
#define SWIFT_OPTNONE __attribute__((optnone))
225-
#else
226-
#define SWIFT_OPTNONE
227-
#endif
228-
229223
// SWIFT_CC(swiftasync) is the Swift async calling convention.
230224
// We assume that it supports mandatory tail call elimination.
231225
#if __has_attribute(swiftasynccall)

stdlib/public/Concurrency/Actor.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2076,12 +2076,10 @@ static void runOnAssumedThread(AsyncTask *task, SerialExecutorRef executor,
20762076
asImpl(executor.getDefaultActor())->unlock(true);
20772077
}
20782078

2079-
// TODO (rokhinip): Workaround rdar://88700717. To be removed with
2080-
// rdar://88711954
20812079
SWIFT_CC(swiftasync)
20822080
static void swift_task_switchImpl(SWIFT_ASYNC_CONTEXT AsyncContext *resumeContext,
20832081
TaskContinuationFunction *resumeFunction,
2084-
SerialExecutorRef newExecutor) SWIFT_OPTNONE {
2082+
SerialExecutorRef newExecutor) {
20852083
auto task = swift_task_getCurrent();
20862084
assert(task && "no current task!");
20872085

0 commit comments

Comments
 (0)