From b4aa83b0b7f4a7ac2038d927e89212b28c3f28a4 Mon Sep 17 00:00:00 2001
From: Derek Xu <derekx@google.com>
Date: Mon, 17 Apr 2023 15:58:28 +0000
Subject: [PATCH] [VM/Service] Rename JSONStream::AppendSerializedObject to
 JSONStream::AppendBytes

TEST=CI

Change-Id: I2bb950c608716156e0dfe357a0fd481463b8d0dc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/287800
Reviewed-by: Ben Konyi <bkonyi@google.com>
---
 runtime/platform/text_buffer.cc        |  1 +
 runtime/vm/json_stream.h               | 10 +++++-----
 runtime/vm/json_writer.cc              |  9 ++++-----
 runtime/vm/json_writer.h               |  6 +++---
 runtime/vm/libfuzzer/dart_libfuzzer.cc |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/runtime/platform/text_buffer.cc b/runtime/platform/text_buffer.cc
index 044b2a1f428..aff44f55d3b 100644
--- a/runtime/platform/text_buffer.cc
+++ b/runtime/platform/text_buffer.cc
@@ -54,6 +54,7 @@ void BaseTextBuffer::AddChar(char ch) {
 }
 
 void BaseTextBuffer::AddRaw(const uint8_t* buffer, intptr_t buffer_length) {
+  ASSERT(buffer != nullptr);
   if (!EnsureCapacity(buffer_length)) {
     buffer_length = capacity_ - length_ - 1;  // Copy what fits.
   }
diff --git a/runtime/vm/json_stream.h b/runtime/vm/json_stream.h
index 0cb325da82c..db1ffc6afdd 100644
--- a/runtime/vm/json_stream.h
+++ b/runtime/vm/json_stream.h
@@ -156,16 +156,16 @@ class JSONStream : ValueObject {
                              intptr_t* offset,
                              intptr_t* count);
 
+  // Append |buffer| to the stream.
+  void AppendBytes(const uint8_t* buffer, intptr_t buffer_length) {
+    writer_.AppendBytes(buffer, buffer_length);
+  }
+
   // Append |serialized_object| to the stream.
   void AppendSerializedObject(const char* serialized_object) {
     writer_.AppendSerializedObject(serialized_object);
   }
 
-  // Append |buffer| to the stream.
-  void AppendSerializedObject(const uint8_t* buffer, intptr_t buffer_length) {
-    writer_.AppendSerializedObject(buffer, buffer_length);
-  }
-
   // Append |serialized_object| to the stream with |property_name|.
   void AppendSerializedObject(const char* property_name,
                               const char* serialized_object) {
diff --git a/runtime/vm/json_writer.cc b/runtime/vm/json_writer.cc
index 6fe6c93ccf7..41af54d05f4 100644
--- a/runtime/vm/json_writer.cc
+++ b/runtime/vm/json_writer.cc
@@ -35,16 +35,15 @@ class MaybeOnStackBuffer {
 JSONWriter::JSONWriter(intptr_t buf_size)
     : open_objects_(0), buffer_(buf_size) {}
 
+void JSONWriter::AppendBytes(const uint8_t* buffer, intptr_t buffer_length) {
+  buffer_.AddRaw(buffer, buffer_length);
+}
+
 void JSONWriter::AppendSerializedObject(const char* serialized_object) {
   PrintCommaIfNeeded();
   buffer_.AddString(serialized_object);
 }
 
-void JSONWriter::AppendSerializedObject(const uint8_t* buffer,
-                                        intptr_t buffer_length) {
-  buffer_.AddRaw(buffer, buffer_length);
-}
-
 void JSONWriter::AppendSerializedObject(const char* property_name,
                                         const char* serialized_object) {
   PrintCommaIfNeeded();
diff --git a/runtime/vm/json_writer.h b/runtime/vm/json_writer.h
index 0a2d9e9690d..fdf9496e1e8 100644
--- a/runtime/vm/json_writer.h
+++ b/runtime/vm/json_writer.h
@@ -23,12 +23,12 @@ class JSONWriter : ValueObject {
 
   void PrintCommaIfNeeded();
 
+  // Append |buffer| to the stream.
+  void AppendBytes(const uint8_t* buffer, intptr_t buffer_length);
+
   // Append |serialized_object| to the stream.
   void AppendSerializedObject(const char* serialized_object);
 
-  // Append |buffer| to the stream.
-  void AppendSerializedObject(const uint8_t* buffer, intptr_t buffer_length);
-
   // Append |serialized_object| to the stream with |property_name|.
   void AppendSerializedObject(const char* property_name,
                               const char* serialized_object);
diff --git a/runtime/vm/libfuzzer/dart_libfuzzer.cc b/runtime/vm/libfuzzer/dart_libfuzzer.cc
index b74813818ff..ac4099288d1 100644
--- a/runtime/vm/libfuzzer/dart_libfuzzer.cc
+++ b/runtime/vm/libfuzzer/dart_libfuzzer.cc
@@ -49,7 +49,7 @@ static int TestUtilities(const uint8_t* Data, size_t Size) {
   // Json writer.
   dart::JSONWriter writer(1);
   writer.OpenObject("object");
-  writer.AppendSerializedObject(Data, Size);
+  writer.AppendBytes(Data, Size);
   writer.CloseObject();
   for (size_t i = 0; i < Size; i++) {
     writer.PrintValue(static_cast<intptr_t>(Data[i]));