Skip to content

Commit b77ea50

Browse files
Revert "Turn on additional musttail checks for swiftc and runtime."
This reverts commit 0255156. Using this flag caused breakage when trying to use upstream LLVM as well as Clang/LLVM from Xcode 12.5. See SR-14714.
1 parent 446580a commit b77ea50

File tree

4 files changed

+0
-26
lines changed

4 files changed

+0
-26
lines changed

include/swift/Option/Options.td

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,12 +1193,6 @@ def user_module_version : Separate<["-"], "user-module-version">,
11931193
HelpText<"Module version specified from Swift module authors">,
11941194
MetaVarName<"<vers>">;
11951195

1196-
// LLVM verification
1197-
def skip_swifttailcc_musttail_check : Flag<["-"], "skip-swifttailcc-musttail-check">,
1198-
Flags<[HelpHidden, DoesNotAffectIncrementalBuild]>,
1199-
HelpText<"Skip additional LLVM verification that all tail calls from "
1200-
"swifttailcc->swifttailcc are marked musttail.">;
1201-
12021196
// VFS
12031197

12041198
def vfsoverlay : JoinedOrSeparate<["-"], "vfsoverlay">,

lib/Driver/ToolChains.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,6 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
323323
arguments.push_back("-enable-anonymous-context-mangled-names");
324324
}
325325

326-
if (!inputArgs.hasArg(options::OPT_skip_swifttailcc_musttail_check)) {
327-
arguments.push_back("-Xllvm");
328-
arguments.push_back("-enable-swifttailcc-musttail-check");
329-
}
330-
331326
// Pass through any subsystem flags.
332327
inputArgs.AddAllArgs(arguments, options::OPT_Xllvm);
333328
inputArgs.AddAllArgs(arguments, options::OPT_Xcc);

stdlib/public/runtime/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ set(swift_runtime_library_compile_flags ${swift_runtime_compile_flags})
7979
list(APPEND swift_runtime_library_compile_flags -DswiftCore_EXPORTS)
8080
list(APPEND swift_runtime_library_compile_flags -I${SWIFT_SOURCE_DIR}/stdlib/include/llvm/Support -I${SWIFT_SOURCE_DIR}/include)
8181

82-
# Check that the runtime is using the async calling convention
83-
# correctly, and that musttail isn't missed by Clang/LLVM.
84-
if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)
85-
list(APPEND swift_runtime_library_compile_flags
86-
"-mllvm" "-enable-swifttailcc-musttail-check")
87-
endif()
88-
8982
set(sdk "${SWIFT_HOST_VARIANT_SDK}")
9083
if(SWIFT_BUILD_STATIC_STDLIB AND "${sdk}" STREQUAL "LINUX")
9184
set(static_binary_lnk_file_list)

unittests/runtime/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,4 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
138138
swiftCore${SWIFT_PRIMARY_VARIANT_SUFFIX}
139139
${PLATFORM_TARGET_LINK_LIBRARIES}
140140
)
141-
142-
# Check that the tests are using the async calling convention
143-
# correctly, and that musttail isn't missed by Clang/LLVM.
144-
if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)
145-
target_compile_options(SwiftRuntimeTests
146-
PUBLIC "-mllvm;-enable-swifttailcc-musttail-check")
147-
endif()
148-
149141
endif()

0 commit comments

Comments
 (0)