Merge pull request swiftlang#74568 from ktoso/wip-remove-old-clang-wo…

…rkaround [Concurrency] Remove OPTNONE workaround for old clang version
rofle100lvl · Jun 20, 2024 · e85b461 · e85b461
2 parents 174983f + a43abe6
commit e85b461
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/include/swift/Runtime/Config.h b/include/swift/Runtime/Config.h
@@ -220,12 +220,6 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define SWIFT_ASYNC_CONTEXT
 #endif
 
-#if __has_attribute(optnone)
-#define SWIFT_OPTNONE __attribute__((optnone))
-#else
-#define SWIFT_OPTNONE
-#endif
-
 // SWIFT_CC(swiftasync) is the Swift async calling convention.
 // We assume that it supports mandatory tail call elimination.
 #if __has_attribute(swiftasynccall)

diff --git a/stdlib/public/Concurrency/Actor.cpp b/stdlib/public/Concurrency/Actor.cpp
@@ -2076,12 +2076,10 @@ static void runOnAssumedThread(AsyncTask *task, SerialExecutorRef executor,
     asImpl(executor.getDefaultActor())->unlock(true);
 }
 
-// TODO (rokhinip): Workaround rdar://88700717. To be removed with
-// rdar://88711954
 SWIFT_CC(swiftasync)
 static void swift_task_switchImpl(SWIFT_ASYNC_CONTEXT AsyncContext *resumeContext,
                                   TaskContinuationFunction *resumeFunction,
-                                  SerialExecutorRef newExecutor) SWIFT_OPTNONE {
+                                  SerialExecutorRef newExecutor) {
   auto task = swift_task_getCurrent();
   assert(task && "no current task!");