Preserve the contents of Dart strings with unmatched surrogate halfs by avoiding a UTF16 -> UTF8

runtime/bin/dbg_message.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/lockers.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
@@ skipping 114 matching lines @@
 }
 
 
 static void FormatEncodedCharsTrunc(dart::TextBuffer* buf,
                                     Dart_Handle str,
                                     intptr_t max_chars) {
   intptr_t str_len = 0;
   Dart_Handle res = Dart_StringLength(str, &str_len);
   ASSERT_NOT_ERROR(res);
   intptr_t num_chars = (str_len > max_chars) ? max_chars : str_len;
-  uint16_t* codepoints =
+  uint16_t* codeunits =
       reinterpret_cast<uint16_t*>(malloc(num_chars * sizeof(uint16_t)));
-  ASSERT(codepoints != NULL);
+  ASSERT(codeunits != NULL);
   intptr_t actual_len = num_chars;
-  res = Dart_StringToUTF16(str, codepoints, &actual_len);
+  res = Dart_StringToUTF16(str, codeunits, &actual_len);
   ASSERT_NOT_ERROR(res);
   ASSERT(num_chars == actual_len);
   for (int i = 0; i < num_chars; i++) {
-    buf->AddEscapedChar(codepoints[i]);
+    buf->EscapeAndAddCodeUnit(codeunits[i]);
   }
   if (str_len > max_chars) {
     buf->Printf("...");
   }
-  free(codepoints);
+  free(codeunits);
 }
 
 
 static void FormatEncodedChars(dart::TextBuffer* buf, Dart_Handle str) {
   intptr_t str_len = 0;
   Dart_Handle res = Dart_StringLength(str, &str_len);
   ASSERT_NOT_ERROR(res);
-  uint16_t* codepoints =
+  uint16_t* codeunits =
       reinterpret_cast<uint16_t*>(malloc(str_len * sizeof(uint16_t)));
-  ASSERT(codepoints != NULL);
+  ASSERT(codeunits != NULL);
   intptr_t actual_len = str_len;
-  res = Dart_StringToUTF16(str, codepoints, &actual_len);
+  res = Dart_StringToUTF16(str, codeunits, &actual_len);
   ASSERT_NOT_ERROR(res);
   ASSERT(str_len == actual_len);
   for (int i = 0; i < str_len; i++) {
-    buf->AddEscapedChar(codepoints[i]);
+    buf->EscapeAndAddCodeUnit(codeunits[i]);
   }
-  free(codepoints);
+  free(codeunits);
 }
 
 
 static void FormatEncodedString(dart::TextBuffer* buf, Dart_Handle str) {
   buf->AddChar('\"');
   FormatEncodedChars(buf, str);
   buf->AddChar('\"');
 }
 
 
@@ skipping 1234 matching lines @@
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }
 
 }  // namespace bin
 }  // namespace dart