Automated rollback of commit c8572b1de4.

PiperOrigin-RevId: 517022726

src/google/protobuf/json/internal/parser.cc

@@ -45,8 +45,6 @@
 #include "google/protobuf/message.h"
 #include "absl/base/attributes.h"
 #include "absl/container/flat_hash_set.h"
-#include "absl/log/absl_check.h"
-#include "absl/log/absl_log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/ascii.h"
@@ -1304,9 +1302,7 @@ absl::Status ParseMessage(JsonLexer& lex, const Desc<Traits>& desc,
 absl::Status JsonStringToMessage(absl::string_view input, Message* message,
                                  json_internal::ParseOptions options) {
   MessagePath path(message->GetDescriptor()->full_name());
-  if (PROTOBUF_DEBUG) {
-    ABSL_DLOG(INFO) << "json2/input: " << absl::CHexEscape(input);
-  }
+  PROTOBUF_DLOG(INFO) << "json2/input: " << absl::CHexEscape(input);
   io::ArrayInputStream in(input.data(), input.size());
   JsonLexer lex(&in, options, &path);
 
@@ -1319,10 +1315,9 @@ absl::Status JsonStringToMessage(absl::string_view input, Message* message,
         "extraneous characters after end of JSON object");
   }
 
-  if (PROTOBUF_DEBUG) {
-    ABSL_DLOG(INFO) << "json2/status: " << s;
-    ABSL_DLOG(INFO) << "json2/output: " << message->DebugString();
-  }
+  PROTOBUF_DLOG(INFO) << "json2/status: " << s;
+  PROTOBUF_DLOG(INFO) << "json2/output: " << message->DebugString();
+
   return s;
 }
 
@@ -1355,9 +1350,7 @@ absl::Status JsonToBinaryStream(google::protobuf::util::TypeResolver* resolver,
     tee_output.emplace(&out);
   }
 
-  if (PROTOBUF_DEBUG) {
-    ABSL_DLOG(INFO) << "json2/input: " << absl::CHexEscape(copy);
-  }
+  PROTOBUF_DLOG(INFO) << "json2/input: " << absl::CHexEscape(copy);
 
   // This scope forces the CodedOutputStream inside of `msg` to flush before we
   // possibly handle logging the binary protobuf output.
@@ -1386,10 +1379,8 @@ absl::Status JsonToBinaryStream(google::protobuf::util::TypeResolver* resolver,
         .Append(out.data(), out.size());
   }
 
-  if (PROTOBUF_DEBUG) {
-    ABSL_DLOG(INFO) << "json2/status: " << s;
-    ABSL_DLOG(INFO) << "json2/output: " << absl::BytesToHexString(out);
-  }
+  PROTOBUF_DLOG(INFO) << "json2/status: " << s;
+  PROTOBUF_DLOG(INFO) << "json2/output: " << absl::BytesToHexString(out);
   return s;
 }
 }  // namespace json_internal

src/google/protobuf/json/internal/unparser.cc

@@ -46,7 +46,6 @@
 #include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/message.h"
 #include "absl/log/absl_check.h"
-#include "absl/log/absl_log.h"
 #include "absl/status/status.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
@@ -855,20 +854,16 @@ absl::Status WriteMessage(JsonWriter& writer, const Msg<Traits>& msg,
 
 absl::Status MessageToJsonString(const Message& message, std::string* output,
                                  json_internal::WriterOptions options) {
-  if (PROTOBUF_DEBUG) {
-    ABSL_DLOG(INFO) << "json2/input: " << message.DebugString();
-  }
+  PROTOBUF_DLOG(INFO) << "json2/input: " << message.DebugString();
   io::StringOutputStream out(output);
   JsonWriter writer(&out, options);
   absl::Status s = WriteMessage<UnparseProto2Descriptor>(
       writer, message, *message.GetDescriptor(), /*is_top_level=*/true);
-  if (PROTOBUF_DEBUG) ABSL_DLOG(INFO) << "json2/status: " << s;
+  PROTOBUF_DLOG(INFO) << "json2/status: " << s;
   RETURN_IF_ERROR(s);
 
   writer.NewLine();
-  if (PROTOBUF_DEBUG) {
-    ABSL_DLOG(INFO) << "json2/output: " << absl::CHexEscape(*output);
-  }
+  PROTOBUF_DLOG(INFO) << "json2/output: " << absl::CHexEscape(*output);
   return absl::OkStatus();
 }
 
@@ -901,9 +896,7 @@ absl::Status BinaryToJsonStream(google::protobuf::util::TypeResolver* resolver,
     tee_output.emplace(&out);
   }
 
-  if (PROTOBUF_DEBUG) {
-    ABSL_DLOG(INFO) << "json2/input: " << absl::BytesToHexString(copy);
-  }
+  PROTOBUF_DLOG(INFO) << "json2/input: " << absl::BytesToHexString(copy);
 
   ResolverPool pool(resolver);
   auto desc = pool.FindMessage(type_url);
@@ -919,7 +912,7 @@ absl::Status BinaryToJsonStream(google::protobuf::util::TypeResolver* resolver,
   absl::Status s = WriteMessage<UnparseProto3Type>(
       writer, *msg, UnparseProto3Type::GetDesc(*msg),
       /*is_top_level=*/true);
-  if (PROTOBUF_DEBUG) ABSL_DLOG(INFO) << "json2/status: " << s;
+  PROTOBUF_DLOG(INFO) << "json2/status: " << s;
   RETURN_IF_ERROR(s);
 
   if (PROTOBUF_DEBUG) {
@@ -928,9 +921,7 @@ absl::Status BinaryToJsonStream(google::protobuf::util::TypeResolver* resolver,
         .Append(out.data(), out.size());
   }
 
-  if (PROTOBUF_DEBUG) {
-    ABSL_DLOG(INFO) << "json2/output: " << absl::CHexEscape(out);
-  }
+  PROTOBUF_DLOG(INFO) << "json2/output: " << absl::CHexEscape(out);
 
   writer.NewLine();
   return absl::OkStatus();

src/google/protobuf/port_def.inc

@@ -83,8 +83,6 @@
 // - MSVC: https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes-history
 //         https://docs.microsoft.com/en-us/visualstudio/releasenotes/vs2017-relnotes-history
 
-#include <cassert>
-
 // Portable fallbacks for C++20 feature test macros:
 // https://en.cppreference.com/w/cpp/feature_test
 #ifndef __has_cpp_attribute
@@ -624,7 +622,7 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
 #endif
 
 // PROTOBUF_ASSUME(pred) tells the compiler that it can assume pred is true. To
-// be safe, we also validate the assumption with an `assert()` in unoptimized
+// be safe, we also validate the assumption with a ABSL_DCHECK in unoptimized
 // builds. The macro does not do anything useful if the compiler does not
 // support __builtin_assume.
 #ifdef PROTOBUF_ASSUME
@@ -632,10 +630,10 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
 #endif
 #if __has_builtin(__builtin_assume)
 #define PROTOBUF_ASSUME(pred) \
-  assert(pred);               \
+  ABSL_DCHECK(pred);               \
   __builtin_assume(pred)
 #else
-#define PROTOBUF_ASSUME(pred) assert(pred)
+#define PROTOBUF_ASSUME(pred) ABSL_DCHECK(pred)
 #endif
 
 // Specify memory alignment for structs, classes, etc.
@@ -1077,6 +1075,15 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
 #define PROTOBUF_DEBUG false
 #endif
 
+// This `for` allows us to condition the `ABSL_LOG` on the define above, so that
+// code can write `PROTOBUF_DLOG(INFO) << ...;` and have it turned off when
+// debug logging is off.
+//
+// This is a `for`, not and `if`, to avoid it accidentally chaining with an
+// `else` below it.
+#define PROTOBUF_DLOG(x) \
+  for (bool b = PROTOBUF_DEBUG; b; b = false) ABSL_LOG(x)
+
 #define PROTO2_IS_OSS true
 
 #ifdef PROTOBUF_NO_THREADLOCAL

src/google/protobuf/port_undef.inc

@@ -113,6 +113,7 @@
 #undef PROTOBUF_NO_THREAD_SAFETY_ANALYSIS
 #undef PROTOBUF_GUARDED_BY
 #undef PROTOBUF_DEBUG
+#undef PROTOBUF_DLOG
 #undef PROTO2_IS_OSS
 #undef PROTOBUF_NO_THREADLOCAL