Revert "Add some support for the code-point code-unit distinction."

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"
 
 namespace dart {
 
-DEFINE_NATIVE_ENTRY(StringBase_createFromUtf16, 1) {
+DEFINE_NATIVE_ENTRY(StringBase_createFromCodePoints, 1) {
   GET_NATIVE_ARGUMENT(Array, a, arguments->NativeArgAt(0));
   // TODO(srdjan): Check that parameterized type is an int.
   Zone* zone = isolate->current_zone();
   intptr_t array_len = a.Length();
 
   // Unbox the array and determine the maximum element width.
   bool is_one_byte_string = true;
-  int32_t* utf32_array = zone->Alloc<int32_t>(array_len);
+  intptr_t utf16_len = array_len;
+  uint32_t* utf32_array = zone->Alloc<uint32_t>(array_len);
   Object& index_object = Object::Handle(isolate);
   for (intptr_t i = 0; i < array_len; i++) {
     index_object = a.At(i);
     if (!index_object.IsSmi()) {
       GrowableArray<const Object*> args;
       args.Add(&index_object);
       Exceptions::ThrowByType(Exceptions::kArgument, args);
     }
     intptr_t value = Smi::Cast(index_object).Value();
-    if (value > Utf16::kMaxCodeUnit) {
+    if (value < 0) {
       GrowableArray<const Object*> args;
       Exceptions::ThrowByType(Exceptions::kArgument, args);
     } else {
       if (value > 0x7F) {
         is_one_byte_string = false;
       }
+      if (value > 0xFFFF) {
+        utf16_len += 1;
+      }
     }
     utf32_array[i] = value;
   }
   if (is_one_byte_string) {
     return OneByteString::New(utf32_array, array_len, Heap::kNew);
   }
-  return TwoByteString::New(array_len, utf32_array, array_len, Heap::kNew);
+  return TwoByteString::New(utf16_len, utf32_array, array_len, Heap::kNew);
 }
 
 
 DEFINE_NATIVE_ENTRY(StringBase_substringUnchecked, 3) {
   GET_NATIVE_ARGUMENT(String, receiver, arguments->NativeArgAt(0));
   GET_NATIVE_ARGUMENT(Smi, start_obj, arguments->NativeArgAt(1));
   GET_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));
 }
 
 
 DEFINE_NATIVE_ENTRY(String_getHashCode, 1) {
   const String& receiver = String::CheckedHandle(arguments->NativeArgAt(0));
   intptr_t hash_val = receiver.Hash();
   ASSERT(hash_val > 0);
   ASSERT(Smi::IsValid(hash_val));
   return Smi::New(hash_val);
 }
 
 
 DEFINE_NATIVE_ENTRY(String_getLength, 1) {
   const String& receiver = String::CheckedHandle(arguments->NativeArgAt(0));
   return Smi::New(receiver.Length());
 }
 
 
-static int32_t StringCodeUnitAt(const String& str, const Integer& index) {
+static int32_t StringValueAt(const String& str, const Integer& index) {
   if (index.IsSmi()) {
     Smi& smi = Smi::Handle();
     smi ^= index.raw();
     int32_t index = smi.Value();
     if ((index < 0) || (index >= str.Length())) {
       GrowableArray<const Object*> arguments;
       arguments.Add(&smi);
       Exceptions::ThrowByType(Exceptions::kRange, arguments);
     }
     return str.CharAt(index);
   } else {
     // An index larger than Smi is always illegal.
     GrowableArray<const Object*> arguments;
     arguments.Add(&index);
     Exceptions::ThrowByType(Exceptions::kRange, arguments);
     return 0;
   }
 }
 
 
 DEFINE_NATIVE_ENTRY(String_charAt, 2) {
   const String& receiver = String::CheckedHandle(arguments->NativeArgAt(0));
   GET_NATIVE_ARGUMENT(Integer, index, arguments->NativeArgAt(1));
-  uint16_t value = StringCodeUnitAt(receiver, index);
-  // The VM does not GC interned strings, so we only create them for a
-  // restricted range.
-  const int32_t kFrequentCharacterLimit = 0xFF;
-  if (value <= kFrequentCharacterLimit) {
-    return Symbols::FromCharCode(value);
-  } else {
-    return String::New(&value, 1);
-  }
+  uint32_t value = StringValueAt(receiver, index);
+  ASSERT(value <= 0x10FFFF);
+  return Symbols::FromCharCode(value);
 }
 
-
-DEFINE_NATIVE_ENTRY(String_codeUnitAt, 2) {
+DEFINE_NATIVE_ENTRY(String_charCodeAt, 2) {
   const String& receiver = String::CheckedHandle(arguments->NativeArgAt(0));
   GET_NATIVE_ARGUMENT(Integer, index, arguments->NativeArgAt(1));
-  int32_t value = StringCodeUnitAt(receiver, index);
-  ASSERT(value <= Utf16::kMaxCodeUnit);
+
+  int32_t value = StringValueAt(receiver, index);
+  ASSERT(value >= 0);
+  ASSERT(value <= 0x10FFFF);
   return Smi::New(value);
 }
 
 
 DEFINE_NATIVE_ENTRY(String_concat, 2) {
   const String& receiver = String::CheckedHandle(arguments->NativeArgAt(0));
   GET_NATIVE_ARGUMENT(String, b, arguments->NativeArgAt(1));
   return String::Concat(receiver, b);
 }
 
@@ skipping 22 matching lines @@
     if (!elem.IsString()) {
       GrowableArray<const Object*> args;
       args.Add(&elem);
       Exceptions::ThrowByType(Exceptions::kArgument, args);
     }
   }
   return String::ConcatAll(strings);
 }
 
 }  // namespace dart