Emit extensions in debug string in wire order

PiperOrigin-RevId: 699254023

Author: protobuf-github-bot

upb/text/debug_string.c

@@ -185,8 +185,7 @@ static void _upb_MessageDebugString(txtenc* e, const upb_Message* msg,
   const upb_MiniTableExtension* ext;
   upb_MessageValue val_ext;
   iter = kUpb_Message_ExtensionBegin;
-  while (UPB_PRIVATE(_upb_Message_NextExtensionReverse)(msg, &ext, &val_ext,
-                                                        &iter)) {
+  while (upb_Message_NextExtension(msg, &ext, &val_ext, &iter)) {
     const upb_MiniTableField* f = &ext->UPB_PRIVATE(field);
     // It is not sufficient to only pass |f| as we lose valuable information
     // about sub-messages. It is required that we pass |ext|.

upb/text/encode_debug_test.cc

@@ -10,7 +10,6 @@
 #include <string>
 
 #include <gtest/gtest.h>
-#include "absl/log/absl_log.h"
 #include "upb/base/string_view.h"
 #include "upb/base/upcast.h"
 #include "upb/mem/arena.h"
@@ -20,44 +19,55 @@
 #include "upb/test/test.upb_minitable.h"
 #include "upb/text/debug_string.h"
 
-TEST(TextNoReflection, Extensions) {
+std::string GetDebugString(const upb_Message* input,
+                           const upb_MiniTable* mt_main) {
+  // Resizing/reallocation of the buffer is not necessary since we're only
+  // testing that we get the expected debug string.
+  char buf[100];
+  int options =
+      UPB_TXTENC_NOSORT;  // Does not matter, but maps will not be sorted.
+  size_t real_size = upb_DebugString(input, mt_main, options, buf, 100);
+  EXPECT_EQ(buf[real_size], '\0');
+  return std::string(buf);
+}
+
+TEST(TextNoReflection, ExtensionsString) {
   const upb_MiniTable* mt_main = upb_0test__ModelWithExtensions_msg_init_ptr;
   upb_Arena* arena = upb_Arena_New();
 
   upb_test_ModelExtension1* extension1 = upb_test_ModelExtension1_new(arena);
   upb_test_ModelExtension1_set_str(extension1,
                                    upb_StringView_FromString("Hello"));
 
+  upb_test_ModelWithExtensions* msg = upb_test_ModelWithExtensions_new(arena);
+
+  upb_test_ModelExtension1_set_model_ext(msg, extension1, arena);
+
+  std::string buf = GetDebugString(UPB_UPCAST(msg), mt_main);
+  upb_Arena_Free(arena);
+  std::string golden = R"([1547] {
+  25: "Hello"
+}
+)";
+  ASSERT_EQ(buf, golden);
+}
+
+TEST(TextNoReflection, ExtensionsInt) {
+  const upb_MiniTable* mt_main = upb_0test__ModelWithExtensions_msg_init_ptr;
+  upb_Arena* arena = upb_Arena_New();
+
   upb_test_ModelExtension2* extension2 = upb_test_ModelExtension2_new(arena);
   upb_test_ModelExtension2_set_i(extension2, 5);
 
   upb_test_ModelWithExtensions* msg = upb_test_ModelWithExtensions_new(arena);
 
-  upb_test_ModelExtension1_set_model_ext(msg, extension1, arena);
   upb_test_ModelExtension2_set_model_ext(msg, extension2, arena);
 
-  // Convert to a type of upb_Message*
-  upb_Message* input = UPB_UPCAST(msg);
-  // Resizing/reallocation of the buffer is not necessary since we're only
-  // testing that we get the expected debug string.
-  char* buf = new char[100];
-  int options =
-      UPB_TXTENC_NOSORT;  // Does not matter, but maps will not be sorted.
-  size_t size = 100;
-  size_t real_size = upb_DebugString(input, mt_main, options, buf, size);
-  ABSL_LOG(INFO) << "Buffer: \n"
-                 << buf << "\n"
-                 << "Size:" << real_size << "\n";
+  std::string buf = GetDebugString(UPB_UPCAST(msg), mt_main);
+  upb_Arena_Free(arena);
   std::string golden = R"([4135] {
   9: 5
 }
-[1547] {
-  25: "Hello"
-}
 )";
-  ASSERT_EQ(buf[real_size], '\0');
-  std::string str(buf);
   ASSERT_EQ(buf, golden);
-  delete[] buf;
-  upb_Arena_Free(arena);
-}
+}