diff --git a/common/check_internal.h b/common/check_internal.h index 300b6028cff9..3a97adf95730 100644 --- a/common/check_internal.h +++ b/common/check_internal.h @@ -37,8 +37,8 @@ namespace Carbon::Internal { // `llvm::formatv` which handles all of the formatting of output. template -[[noreturn, gnu::cold, clang::noinline, clang::preserve_most]] auto CheckFail( - Ts&&... values) -> void { +[[noreturn, gnu::cold, clang::noinline]] auto CheckFail(Ts&&... values) + -> void { if constexpr (llvm::StringRef(FormatStr).empty()) { // Skip the format string rendering if empty. Note that we don't skip it // even if there are no values as we want to have consistent handling of diff --git a/common/vlog.h b/common/vlog.h index 37cba0195559..952181b6612a 100644 --- a/common/vlog.h +++ b/common/vlog.h @@ -19,8 +19,8 @@ namespace Carbon::Internal { // Internally uses `llvm::formatv` to render the format string with any value // arguments, and streams the result to the provided stream. template -[[clang::noinline, clang::preserve_most]] auto VLogImpl( - llvm::raw_ostream* stream, Ts&&... values) -> void { +[[clang::noinline]] auto VLogImpl(llvm::raw_ostream* stream, Ts&&... values) + -> void { *stream << llvm::formatv(FormatStr.c_str(), std::forward(values)...); }