Pass primitive types by value when streaming into LogMessage. Forwarding scalar and pointer values through a reference parameter forced callsites to spill register or constant values onto the stack just to pass their address. Pass primitive scalar and pointer types by value to the out-of-line streaming helper so they stay in registers, while continuing to pass other types by reference. PiperOrigin-RevId: 1015355424
diff --git a/absl/log/internal/log_message.cc b/absl/log/internal/log_message.cc index 8bdbf60..5e58612 100644 --- a/absl/log/internal/log_message.cc +++ b/absl/log/internal/log_message.cc
@@ -426,22 +426,22 @@ } // NOLINTBEGIN(runtime/int) // NOLINTBEGIN(google-runtime-int) -template void LogMessage::Stream(const char& v); -template void LogMessage::Stream(const signed char& v); -template void LogMessage::Stream(const unsigned char& v); -template void LogMessage::Stream(const short& v); -template void LogMessage::Stream(const unsigned short& v); -template void LogMessage::Stream(const int& v); -template void LogMessage::Stream(const unsigned int& v); -template void LogMessage::Stream(const long& v); -template void LogMessage::Stream(const unsigned long& v); -template void LogMessage::Stream(const long long& v); -template void LogMessage::Stream(const unsigned long long& v); -template void LogMessage::Stream(void* const& v); -template void LogMessage::Stream(const void* const& v); -template void LogMessage::Stream(const float& v); -template void LogMessage::Stream(const double& v); -template void LogMessage::Stream(const bool& v); +template void LogMessage::Stream(char v); +template void LogMessage::Stream(signed char v); +template void LogMessage::Stream(unsigned char v); +template void LogMessage::Stream(short v); +template void LogMessage::Stream(unsigned short v); +template void LogMessage::Stream(int v); +template void LogMessage::Stream(unsigned int v); +template void LogMessage::Stream(long v); +template void LogMessage::Stream(unsigned long v); +template void LogMessage::Stream(long long v); +template void LogMessage::Stream(unsigned long long v); +template void LogMessage::Stream(void* absl_nullable v); +template void LogMessage::Stream(const void* absl_nullable v); +template void LogMessage::Stream(float v); +template void LogMessage::Stream(double v); +template void LogMessage::Stream(bool v); // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int)
diff --git a/absl/log/internal/log_message.h b/absl/log/internal/log_message.h index 1663827..4e2e729 100644 --- a/absl/log/internal/log_message.h +++ b/absl/log/internal/log_message.h
@@ -161,57 +161,74 @@ // By-value overloads for small, common types let us overlook common failures // to define globals and static data members (i.e. in a .cc file). + // Values are passed by value to `Stream` so they stay in registers. // NOLINTBEGIN(runtime/int) // NOLINTBEGIN(google-runtime-int) // clang-format off: The CUDA toolchain cannot handle these <<<'s ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(char v) { - return operator<< <char>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(signed char v) { - return operator<< <signed char>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(unsigned char v) { - return operator<< <unsigned char>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(signed short v) { - return operator<< <signed short>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(signed int v) { - return operator<< <signed int>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(signed long v) { - return operator<< <signed long>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(signed long long v) { - return operator<< <signed long long>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(unsigned short v) { - return operator<< <unsigned short>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(unsigned int v) { - return operator<< <unsigned int>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(unsigned long v) { - return operator<< <unsigned long>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(unsigned long long v) { - return operator<< <unsigned long long>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(void* absl_nullable v) { - return operator<< <void*>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<( const void* absl_nullable v) { - return operator<< <const void*>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(float v) { - return operator<< <float>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(double v) { - return operator<< <double>(v); + Stream(v); + return *this; } ABSL_ATTRIBUTE_ALWAYS_INLINE LogMessage& operator<<(bool v) { - return operator<< <bool>(v); + Stream(v); + return *this; } // clang-format on // NOLINTEND(google-runtime-int) @@ -332,7 +349,7 @@ void ToSinkOnlyImpl(absl::LogSink* absl_nonnull sink); template <typename T> - ABSL_ATTRIBUTE_NOINLINE void Stream(const T& v); + ABSL_ATTRIBUTE_NOINLINE void Stream(T v); enum class StringType { kLiteral, @@ -418,20 +435,23 @@ template <typename T> inline LogMessage& LogMessage::operator<<(const T& v) { - Stream(v); + Stream<const T&>(v); return *this; } // Note: the following is declared `ABSL_ATTRIBUTE_NOINLINE` template <typename T> -void LogMessage::Stream(const T& v) { - if constexpr (absl::HasAbslStringify<T>::value) { +void LogMessage::Stream(T v) { + // `T` may be `const U&` (from the generic `operator<<`); strip `&` and + // `const` (preserving `volatile`) so trait and `NullGuard` lookups see `U`. + using RawT = std::remove_const_t<std::remove_reference_t<T>>; + if constexpr (absl::HasAbslStringify<RawT>::value) { StringifySink sink(*this); // Replace with public API. AbslStringify(sink, v); } else { OstreamView view(*data_); - view.stream() << log_internal::NullGuard<T>().Guard(v); + view.stream() << log_internal::NullGuard<RawT>().Guard(v); } } @@ -458,22 +478,22 @@ // emitting a function call either way. // NOLINTBEGIN(runtime/int) // NOLINTBEGIN(google-runtime-int) -extern template void LogMessage::Stream(const char& v); -extern template void LogMessage::Stream(const signed char& v); -extern template void LogMessage::Stream(const unsigned char& v); -extern template void LogMessage::Stream(const short& v); -extern template void LogMessage::Stream(const unsigned short& v); -extern template void LogMessage::Stream(const int& v); -extern template void LogMessage::Stream(const unsigned int& v); -extern template void LogMessage::Stream(const long& v); -extern template void LogMessage::Stream(const unsigned long& v); -extern template void LogMessage::Stream(const long long& v); -extern template void LogMessage::Stream(const unsigned long long& v); -extern template void LogMessage::Stream(void* absl_nullable const& v); -extern template void LogMessage::Stream(const void* absl_nullable const& v); -extern template void LogMessage::Stream(const float& v); -extern template void LogMessage::Stream(const double& v); -extern template void LogMessage::Stream(const bool& v); +extern template void LogMessage::Stream(char v); +extern template void LogMessage::Stream(signed char v); +extern template void LogMessage::Stream(unsigned char v); +extern template void LogMessage::Stream(short v); +extern template void LogMessage::Stream(unsigned short v); +extern template void LogMessage::Stream(int v); +extern template void LogMessage::Stream(unsigned int v); +extern template void LogMessage::Stream(long v); +extern template void LogMessage::Stream(unsigned long v); +extern template void LogMessage::Stream(long long v); +extern template void LogMessage::Stream(unsigned long long v); +extern template void LogMessage::Stream(void* absl_nullable v); +extern template void LogMessage::Stream(const void* absl_nullable v); +extern template void LogMessage::Stream(float v); +extern template void LogMessage::Stream(double v); +extern template void LogMessage::Stream(bool v); // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int)