Merge pull request #36424 from varungandhi-apple/vg-remove-cmake-flag

Author: swift-ci

CMakeLists.txt

@@ -196,13 +196,6 @@ if(SWIFT_PROFDATA_FILE AND EXISTS ${SWIFT_PROFDATA_FILE})
   add_definitions("-fprofile-instr-use=${SWIFT_PROFDATA_FILE}")
 endif()
 
-option(USE_SWIFT_ASYNC_LOWERING
-       "Indicates if Swiftc should use async-specific lowering for async
-        functions if it is supported for the target. The runtime also checks
-        this setting before using async-specific attributes. This only applies
-        to the async calling convention and not to the async context attribute."
-	TRUE)
-
 #
 # User-configurable Swift Standard Library specific options.
 #

include/swift/AST/IRGenOptions.h

@@ -338,10 +338,6 @@ class IRGenOptions {
   /// Pointer authentication.
   PointerAuthOptions PointerAuth;
 
-  /// Use async-specific lowering for async functions if it is supported for
-  /// the target.
-  bool UseAsyncLowering = USE_SWIFT_ASYNC_LOWERING;
-
   /// The different modes for dumping IRGen type info.
   enum class TypeInfoDumpFilter {
     All,

include/swift/Config.h.in

@@ -8,6 +8,4 @@
 
 #cmakedefine HAVE_PROC_PID_RUSAGE 1
 
-#cmakedefine01 USE_SWIFT_ASYNC_LOWERING
-
 #endif // SWIFT_CONFIG_H

include/swift/Runtime/CMakeConfig.h.in

@@ -7,6 +7,4 @@
 #cmakedefine01 SWIFT_BNI_OS_BUILD
 #cmakedefine01 SWIFT_BNI_XCODE_BUILD
 
-#cmakedefine01 USE_SWIFT_ASYNC_LOWERING
-
 #endif

include/swift/Runtime/Config.h

@@ -184,8 +184,7 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 
 // SWIFT_CC(swiftasync) is the Swift async calling convention.
 // We assume that it supports mandatory tail call elimination.
-#if __has_feature(swiftasynccc) && USE_SWIFT_ASYNC_LOWERING && \
-    __has_attribute(swiftasynccall)
+#if __has_feature(swiftasynccc) && __has_attribute(swiftasynccall)
 #define SWIFT_CC_swiftasync __attribute__((swiftasynccall))
 #else
 #define SWIFT_CC_swiftasync SWIFT_CC_swift

lib/IRGen/IRGenModule.cpp

@@ -551,7 +551,7 @@ IRGenModule::IRGenModule(IRGenerator &irgen,
   bool isAsyncCCSupported =
     clangASTContext.getTargetInfo().checkCallingConvention(clang::CC_SwiftAsync)
     == clang::TargetInfo::CCCR_OK;
-  if (opts.UseAsyncLowering && isAsyncCCSupported) {
+  if (isAsyncCCSupported) {
     SwiftAsyncCC = llvm::CallingConv::SwiftTail;
     AsyncTailCallKind = llvm::CallInst::TCK_MustTail;
   } else {