Change VM's string-buffer patch to use a Uin16Array as backing buffer.

runtime/lib/string.cc

 // Copyright (c) 2011, 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 "vm/bootstrap_natives.h"
 
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 #include "vm/symbols.h"
@@ skipping 31 matching lines @@
       }
     }
     utf32_array[i] = value;
   }
   if (is_one_byte_string) {
     return OneByteString::New(utf32_array, array_len, Heap::kNew);
   }
   return TwoByteString::New(utf16_len, utf32_array, array_len, Heap::kNew);
 }
 
-

[srdjan, 2013/03/07 17:58:34]

Please restore line

[Lasse Reichstein Nielsen, 2013/03/08 07:18:44]

Done. *And* saving the buffer this time.

 DEFINE_NATIVE_ENTRY(StringBase_substringUnchecked, 3) {
   const String& receiver = String::CheckedHandle(arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, start_obj, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, end_obj, arguments->NativeArgAt(2));
 
   intptr_t start = start_obj.Value();
   intptr_t end = end_obj.Value();
   return String::SubString(receiver, start, (end - start));
 }
 
@@ skipping 127 matching lines @@
     elem ^= strings.At(i);
     if (!elem.IsString()) {
       const Array& args = Array::Handle(Array::New(1));
       args.SetAt(0, elem);
       Exceptions::ThrowByType(Exceptions::kArgument, args);
     }
   }
   return String::ConcatAll(strings);
 }
 
+DEFINE_NATIVE_ENTRY(StringBuffer_createStringFromUint16Array, 3) {
+  GET_NON_NULL_NATIVE_ARGUMENT(Uint16Array, a, arguments->NativeArgAt(0));

[Vyacheslav Egorov (Google), 2013/03/07 13:50:52]

I'd give a longer name to a.

[Lasse Reichstein Nielsen, 2013/03/08 07:18:44]

Done.

+  GET_NON_NULL_NATIVE_ARGUMENT(Smi, smiLength, arguments->NativeArgAt(1));

[Vyacheslav Egorov (Google), 2013/03/07 13:50:52]

smiLength -> length

[Lasse Reichstein Nielsen, 2013/03/08 07:18:44]

Done.

+  GET_NON_NULL_NATIVE_ARGUMENT(Bool, isLatin1, arguments->NativeArgAt(2));
+  intptr_t array_len = a.Length();
+  int32_t length = smiLength.Value();

[Vyacheslav Egorov (Google), 2013/03/07 13:50:52]

length -> length_value

[srdjan, 2013/03/07 17:58:34]

intr32_t -> intptr_t; on x64 Smi is greater than int32_t.

[Lasse Reichstein Nielsen, 2013/03/08 07:18:44]

Done.

+  if (length < 0 || length > array_len) {
+    const Array& args = Array::Handle(Array::New(1));
+    args.SetAt(0, smiLength);
+    Exceptions::ThrowByType(Exceptions::kRange, args);
+  }
+  const String& result = isLatin1.value()
+      ? String::Handle(OneByteString::New(length, Heap::kNew))
+      : String::Handle(TwoByteString::New(length, Heap::kNew));
+  NoGCScope no_gc;
+  uint16_t* data_position = reinterpret_cast<uint16_t*>(

[Vyacheslav Egorov (Google), 2013/03/07 13:50:52]

consider a.ByteAddr(0)

[Lasse Reichstein Nielsen, 2013/03/08 07:18:44]

I already tried that, but it seems to be private on Uint16Array. Could I somehow
cast it to a ByteArray, where ByteAddr is public?

[Ivan Posva, 2013/03/08 09:15:41]

I told Lasse to make the ByteAddr public. This is all changing with TypedData
anyway, we will have to properly deal with it then.

[Lasse Reichstein Nielsen, 2013/03/08 10:19:37]

And it works with a public ByteAddr.

+      reinterpret_cast<char*>(a.raw()) +
+      Uint16Array::data_offset() - kHeapObjectTag);
+  String::Copy(result, 0, data_position, length);
+  return result.raw();
+}
+
 }  // namespace dart