Revert: Move RTC_CHECK_OP error message construction out of header file.

Doesn't build with older MSVC 2017 versions.

Reverts https://webrtc-review.googlesource.com/86544

Change-Id: Ieb80a6717929d153e39a2f04cb8a85631a03bc7a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

3 files changed, 147 insertions, 117 deletions

diff --git a/chromium/third_party/webrtc/rtc_base/checks.cc b/chromium/third_party/webrtc/rtc_base/checks.cc
index b8b5c9da9bd..da93b8b3240 100644
--- a/chromium/third_party/webrtc/rtc_base/checks.cc
+++ b/chromium/third_party/webrtc/rtc_base/checks.cc
@@ -57,56 +57,22 @@ __attribute__((__format__(__printf__, 2, 3)))
 }
 
 namespace rtc {
-namespace webrtc_checks_impl {
-
-// Reads one argument from args, appends it to s and advances fmt.
-// Returns true iff an argument was sucessfully parsed.
-bool ParseArg(va_list* args, const CheckArgType** fmt, std::string* s) {
-  if (**fmt == CheckArgType::kEnd)
-    return false;
-
-  switch (**fmt) {
-    case CheckArgType::kInt:
-      AppendFormat(s, "%d", va_arg(*args, int));
-      break;
-    case CheckArgType::kLong:
-      AppendFormat(s, "%ld", va_arg(*args, long));
-      break;
-    case CheckArgType::kLongLong:
-      AppendFormat(s, "%lld", va_arg(*args, long long));
-      break;
-    case CheckArgType::kUInt:
-      AppendFormat(s, "%u", va_arg(*args, unsigned));
-      break;
-    case CheckArgType::kULong:
-      AppendFormat(s, "%lu", va_arg(*args, unsigned long));
-      break;
-    case CheckArgType::kULongLong:
-      AppendFormat(s, "%llu", va_arg(*args, unsigned long long));
-      break;
-    case CheckArgType::kDouble:
-      AppendFormat(s, "%g", va_arg(*args, double));
-      break;
-    case CheckArgType::kLongDouble:
-      AppendFormat(s, "%Lg", va_arg(*args, long double));
-      break;
-    case CheckArgType::kCharP:
-      s->append(va_arg(*args, const char*));
-      break;
-    case CheckArgType::kStdString:
-      s->append(*va_arg(*args, const std::string*));
-      break;
-    case CheckArgType::kVoidP:
-      AppendFormat(s, "%p", va_arg(*args, const void*));
-      break;
-    default:
-      s->append("[Invalid CheckArgType]");
-      return false;
-  }
-  (*fmt)++;
-  return true;
-}
 
+// MSVC doesn't like complex extern templates and DLLs.
+#if !defined(COMPILER_MSVC)
+// Explicit instantiations for commonly used comparisons.
+template std::string* MakeCheckOpString<int, int>(
+    const int&, const int&, const char* names);
+template std::string* MakeCheckOpString<unsigned long, unsigned long>(
+    const unsigned long&, const unsigned long&, const char* names);
+template std::string* MakeCheckOpString<unsigned long, unsigned int>(
+    const unsigned long&, const unsigned int&, const char* names);
+template std::string* MakeCheckOpString<unsigned int, unsigned long>(
+    const unsigned int&, const unsigned long&, const char* names);
+template std::string* MakeCheckOpString<std::string, std::string>(
+    const std::string&, const std::string&, const char* name);
+#endif
+namespace webrtc_checks_impl {
 RTC_NORETURN void FatalLog(const char* file,
                            int line,
                            const char* message,
@@ -124,23 +90,48 @@ RTC_NORETURN void FatalLog(const char* file,
                "# Check failed: %s",
                file, line, LAST_SYSTEM_ERROR, message);
 
-  if (*fmt == CheckArgType::kCheckOp) {
-    // This log message was generated by RTC_CHECK_OP, so we have to complete
-    // the error message using the operands that have been passed as the first
-    // two arguments.
-    fmt++;
-
-    std::string s1, s2;
-    if (ParseArg(&args, &fmt, &s1) && ParseArg(&args, &fmt, &s2))
-      AppendFormat(&s, " (%s vs. %s)\n# ", s1.c_str(), s2.c_str());
-  } else {
-    s.append("\n# ");
+  for (; *fmt != CheckArgType::kEnd; ++fmt) {
+    switch (*fmt) {
+      case CheckArgType::kInt:
+        AppendFormat(&s, "%d", va_arg(args, int));
+        break;
+      case CheckArgType::kLong:
+        AppendFormat(&s, "%ld", va_arg(args, long));
+        break;
+      case CheckArgType::kLongLong:
+        AppendFormat(&s, "%lld", va_arg(args, long long));
+        break;
+      case CheckArgType::kUInt:
+        AppendFormat(&s, "%u", va_arg(args, unsigned));
+        break;
+      case CheckArgType::kULong:
+        AppendFormat(&s, "%lu", va_arg(args, unsigned long));
+        break;
+      case CheckArgType::kULongLong:
+        AppendFormat(&s, "%llu", va_arg(args, unsigned long long));
+        break;
+      case CheckArgType::kDouble:
+        AppendFormat(&s, "%g", va_arg(args, double));
+        break;
+      case CheckArgType::kLongDouble:
+        AppendFormat(&s, "%Lg", va_arg(args, long double));
+        break;
+      case CheckArgType::kCharP:
+        s.append(va_arg(args, const char*));
+        break;
+      case CheckArgType::kStdString:
+        s.append(*va_arg(args, const std::string*));
+        break;
+      case CheckArgType::kVoidP:
+        AppendFormat(&s, "%p", va_arg(args, const void*));
+        break;
+      default:
+        s.append("[Invalid CheckArgType]");
+        goto processing_loop_end;
+    }
   }
 
-  // Append all the user-supplied arguments to the message.
-  while (ParseArg(&args, &fmt, &s))
-    ;
-
+processing_loop_end:
   va_end(args);
 
   const char* output = s.c_str();
diff --git a/chromium/third_party/webrtc/rtc_base/checks.h b/chromium/third_party/webrtc/rtc_base/checks.h
index 9de6d47573c..b37df0daba9 100644
--- a/chromium/third_party/webrtc/rtc_base/checks.h
+++ b/chromium/third_party/webrtc/rtc_base/checks.h
@@ -40,6 +40,7 @@ RTC_NORETURN void rtc_FatalMessage(const char* file, int line, const char* msg);
 #ifdef __cplusplus
 // C++ version.
 
+#include <sstream>
 #include <string>
 
 #include "rtc_base/numerics/safe_compare.h"
@@ -100,12 +101,6 @@ enum class CheckArgType : int8_t {
   kCharP,
   kStdString,
   kVoidP,
-
-  // kCheckOp doesn't represent an argument type. Instead, it is sent as the
-  // first argument from RTC_CHECK_OP to make FatalLog use the next two
-  // arguments to build the special CHECK_OP error message
-  // (the "a == b (1 vs. 2)" bit).
-  kCheckOp,
 };
 
 RTC_NORETURN void FatalLog(const char* file,
@@ -196,16 +191,6 @@ class LogStreamer<> final {
     static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd};
     FatalLog(file, line, message, t, args.GetVal()...);
   }
-
-  template <typename... Us>
-  RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file,
-                                                        const int line,
-                                                        const char* message,
-                                                        const Us&... args) {
-    static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()...,
-                                         CheckArgType::kEnd};
-    FatalLog(file, line, message, t, args.GetVal()...);
-  }
 };
 
 // Inductive case: We've already seen at least one << argument. The most recent
@@ -242,14 +227,6 @@ class LogStreamer<T, Ts...> final {
     prior_->Call(file, line, message, arg_, args...);
   }
 
-  template <typename... Us>
-  RTC_NORETURN RTC_FORCE_INLINE void CallCheckOp(const char* file,
-                                                 const int line,
-                                                 const char* message,
-                                                 const Us&... args) const {
-    prior_->CallCheckOp(file, line, message, arg_, args...);
-  }
-
  private:
   // The most recent argument.
   T arg_;
@@ -258,7 +235,6 @@ class LogStreamer<T, Ts...> final {
   const LogStreamer<Ts...>* prior_;
 };
 
-template <bool isCheckOp>
 class FatalLogCall final {
  public:
   FatalLogCall(const char* file, int line, const char* message)
@@ -268,8 +244,7 @@ class FatalLogCall final {
   template <typename... Ts>
   RTC_NORETURN RTC_FORCE_INLINE void operator&(
       const LogStreamer<Ts...>& streamer) {
-    isCheckOp ? streamer.CallCheckOp(file_, line_, message_)
-              : streamer.Call(file_, line_, message_);
+    streamer.Call(file_, line_, message_);
   }
 
  private:
@@ -284,10 +259,10 @@ class FatalLogCall final {
 // in a particularly convoluted way with an extra ?: because that appears to be
 // the simplest construct that keeps Visual Studio from complaining about
 // condition being unused).
-#define RTC_EAT_STREAM_PARAMETERS(ignored)                        \
-  (true ? true : ((void)(ignored), true))                         \
-      ? static_cast<void>(0)                                      \
-      : rtc::webrtc_checks_impl::FatalLogCall<false>("", 0, "") & \
+#define RTC_EAT_STREAM_PARAMETERS(ignored)                 \
+  (true ? true : ((void)(ignored), true))                  \
+      ? static_cast<void>(0)                               \
+      : rtc::webrtc_checks_impl::FatalLogCall("", 0, "") & \
             rtc::webrtc_checks_impl::LogStreamer<>()
 
 // Call RTC_EAT_STREAM_PARAMETERS with an argument that fails to compile if
@@ -302,19 +277,80 @@ class FatalLogCall final {
 //
 // We make sure RTC_CHECK et al. always evaluates |condition|, as
 // doing RTC_CHECK(FunctionWithSideEffect()) is a common idiom.
-#define RTC_CHECK(condition)                                       \
-  while (!(condition))                                             \
-  rtc::webrtc_checks_impl::FatalLogCall<false>(__FILE__, __LINE__, \
-                                               #condition) &       \
+#define RTC_CHECK(condition)                                              \
+  while (!(condition))                                                    \
+  rtc::webrtc_checks_impl::FatalLogCall(__FILE__, __LINE__, #condition) & \
       rtc::webrtc_checks_impl::LogStreamer<>()
 
 // Helper macro for binary operators.
 // Don't use this macro directly in your code, use RTC_CHECK_EQ et al below.
-#define RTC_CHECK_OP(name, op, val1, val2)                               \
-  while (!rtc::Safe##name((val1), (val2)))                               \
-  rtc::webrtc_checks_impl::FatalLogCall<true>(__FILE__, __LINE__,        \
-                                              #val1 " " #op " " #val2) & \
-      rtc::webrtc_checks_impl::LogStreamer<>() << (val1) << (val2)
+// RTC_CHECK_EQ(...) else { ... } work properly.
+#define RTC_CHECK_OP(name, op, val1, val2)                                    \
+  while (std::string* _result =                                               \
+             rtc::Check##name##Impl((val1), (val2), #val1 " " #op " " #val2)) \
+  rtc::webrtc_checks_impl::FatalLogCall(__FILE__, __LINE__,                   \
+                                        _result->c_str()) &                   \
+      rtc::webrtc_checks_impl::LogStreamer<>()
+
+// Build the error message string.  This is separate from the "Impl"
+// function template because it is not performance critical and so can
+// be out of line, while the "Impl" code should be inline.  Caller
+// takes ownership of the returned string.
+template<class t1, class t2>
+std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
+  // TODO(jonasolsson): Use absl::StrCat() instead.
+  std::ostringstream ss;
+  ss << names << " (" << v1 << " vs. " << v2 << ")";
+  std::string* msg = new std::string(ss.str());
+  return msg;
+}
+
+// MSVC doesn't like complex extern templates and DLLs.
+#if !defined(COMPILER_MSVC)
+// Commonly used instantiations of MakeCheckOpString<>. Explicitly instantiated
+// in logging.cc.
+extern template std::string* MakeCheckOpString<int, int>(
+    const int&, const int&, const char* names);
+extern template
+std::string* MakeCheckOpString<unsigned long, unsigned long>(
+    const unsigned long&, const unsigned long&, const char* names);
+extern template
+std::string* MakeCheckOpString<unsigned long, unsigned int>(
+    const unsigned long&, const unsigned int&, const char* names);
+extern template
+std::string* MakeCheckOpString<unsigned int, unsigned long>(
+    const unsigned int&, const unsigned long&, const char* names);
+extern template
+std::string* MakeCheckOpString<std::string, std::string>(
+    const std::string&, const std::string&, const char* name);
+#endif
+
+// Helper functions for RTC_CHECK_OP macro.
+// The (int, int) specialization works around the issue that the compiler
+// will not instantiate the template version of the function on values of
+// unnamed enum type - see comment below.
+#define DEFINE_RTC_CHECK_OP_IMPL(name)                                       \
+  template <class t1, class t2>                                              \
+  inline std::string* Check##name##Impl(const t1& v1, const t2& v2,          \
+                                        const char* names) {                 \
+    if (rtc::Safe##name(v1, v2))                                             \
+      return nullptr;                                                        \
+    else                                                                     \
+      return rtc::MakeCheckOpString(v1, v2, names);                          \
+  }                                                                          \
+  inline std::string* Check##name##Impl(int v1, int v2, const char* names) { \
+    if (rtc::Safe##name(v1, v2))                                             \
+      return nullptr;                                                        \
+    else                                                                     \
+      return rtc::MakeCheckOpString(v1, v2, names);                          \
+  }
+DEFINE_RTC_CHECK_OP_IMPL(Eq)
+DEFINE_RTC_CHECK_OP_IMPL(Ne)
+DEFINE_RTC_CHECK_OP_IMPL(Le)
+DEFINE_RTC_CHECK_OP_IMPL(Lt)
+DEFINE_RTC_CHECK_OP_IMPL(Ge)
+DEFINE_RTC_CHECK_OP_IMPL(Gt)
+#undef DEFINE_RTC_CHECK_OP_IMPL
 
 #define RTC_CHECK_EQ(val1, val2) RTC_CHECK_OP(Eq, ==, val1, val2)
 #define RTC_CHECK_NE(val1, val2) RTC_CHECK_OP(Ne, !=, val1, val2)
@@ -348,9 +384,8 @@ class FatalLogCall final {
 #define RTC_NOTREACHED() RTC_DCHECK(RTC_UNREACHABLE_CODE_HIT)
 
 // TODO(bugs.webrtc.org/8454): Add an RTC_ prefix or rename differently.
-#define FATAL()                                                    \
-  rtc::webrtc_checks_impl::FatalLogCall<false>(__FILE__, __LINE__, \
-                                               "FATAL()") &        \
+#define FATAL()                                                          \
+  rtc::webrtc_checks_impl::FatalLogCall(__FILE__, __LINE__, "FATAL()") & \
       rtc::webrtc_checks_impl::LogStreamer<>()
 
 // Performs the integer division a/b and returns the result. CHECKs that the
diff --git a/chromium/third_party/webrtc/rtc_base/logging_unittest.cc b/chromium/third_party/webrtc/rtc_base/logging_unittest.cc
index a475e52d465..16a5ad02a79 100644
--- a/chromium/third_party/webrtc/rtc_base/logging_unittest.cc
+++ b/chromium/third_party/webrtc/rtc_base/logging_unittest.cc
@@ -219,34 +219,38 @@ TEST(LogTest, SingleStream) {
   EXPECT_EQ(sev, LogMessage::GetLogToStream(nullptr));
 }
 
+/*
 #if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(LogTest, Checks) {
   EXPECT_DEATH(FATAL() << "message",
                "\n\n#\n"
-               "# Fatal error in: \\S+, line \\w+\n"
-               "# last system error: \\w+\n"
+               "# Fatal error in: \\S+, line \\d+\n"
+               "# last system error: \\d+\n"
                "# Check failed: FATAL\\(\\)\n"
-               "# message");
+               "# message"
+               );
 
   int a = 1, b = 2;
   EXPECT_DEATH(RTC_CHECK_EQ(a, b) << 1 << 2u,
                "\n\n#\n"
-               "# Fatal error in: \\S+, line \\w+\n"
-               "# last system error: \\w+\n"
+               "# Fatal error in: \\S+, line \\d+\n"
+               "# last system error: \\d+\n"
                "# Check failed: a == b \\(1 vs. 2\\)\n"
-               "# 12");
+               "# 12"
+               );
   RTC_CHECK_EQ(5, 5);
 
   RTC_CHECK(true) << "Shouldn't crash" << 1;
   EXPECT_DEATH(RTC_CHECK(false) << "Hi there!",
                "\n\n#\n"
-               "# Fatal error in: \\S+, line \\w+\n"
-               "# last system error: \\w+\n"
+               "# Fatal error in: \\S+, line \\d+\n"
+               "# last system error: \\d+\n"
                "# Check failed: false\n"
-               "# Hi there!");
+               "# Hi there!"
+               );
 }
 #endif
-
+*/
 // Test using multiple log streams. The INFO stream should get the INFO message,
 // the VERBOSE stream should get the INFO and the VERBOSE.
 // We should restore the correct global state at the end.