Assign external sizes to external strings and to external typed data created by the VM.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "lib/stacktrace.h"
@@ skipping 2539 matching lines @@
   if (size == NULL) {
     RETURN_NULL_ERROR(size);
   }
   *size = (str_obj.Length() * str_obj.CharSize());
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_MakeExternalString(Dart_Handle str,
                                                 void* array,
-                                                intptr_t length,
+                                                intptr_t external_size,
                                                 void* peer,
                                                 Dart_PeerFinalizer cback) {
   DARTSCOPE(Thread::Current());
   if (!FLAG_support_externalizable_strings) {
     return Api::NewError("Dart_MakeExternalString with "
                          "--support_externalizable_strings=false");
   }
   const String& str_obj = Api::UnwrapStringHandle(Z, str);
   if (str_obj.IsExternal()) {
     return str;  // String is already an external string.
   }
   if (str_obj.IsNull()) {
     RETURN_TYPE_ERROR(Z, str, String);
   }
   if (array == NULL) {
     RETURN_NULL_ERROR(array);
   }
   intptr_t str_size = (str_obj.Length() * str_obj.CharSize());
-  if ((length < str_size) || (length > String::kMaxElements)) {
+  if ((external_size < str_size) || (external_size > String::kMaxElements)) {
     return Api::NewError("Dart_MakeExternalString "
-                         "expects argument length to be in the range"
+                         "expects argument external_size to be in the range"
                          "[%" Pd "..%" Pd "].",
                          str_size, String::kMaxElements);
   }
   if (str_obj.InVMHeap()) {
     // Since the string object is read only we do not externalize
     // the string but instead copy the contents of the string into the
     // specified buffer add the specified peer/cback as a Peer object
     // to this string. The Api::StringGetPeerHelper function picks up
     // the peer from the Peer table.
     intptr_t copy_len = str_obj.Length();
     if (str_obj.IsOneByteString()) {
-      ASSERT(length >= copy_len);
+      ASSERT(external_size >= copy_len);
       uint8_t* latin1_array = reinterpret_cast<uint8_t*>(array);
       for (intptr_t i = 0; i < copy_len; i++) {
         latin1_array[i] = static_cast<uint8_t>(str_obj.CharAt(i));
       }
-      OneByteString::SetPeer(str_obj, peer, cback);
+      OneByteString::SetPeer(str_obj, external_size, peer, cback);
     } else {
       ASSERT(str_obj.IsTwoByteString());
-      ASSERT(length >= (copy_len * str_obj.CharSize()));
+      ASSERT(external_size >= (copy_len * str_obj.CharSize()));
       uint16_t* utf16_array = reinterpret_cast<uint16_t*>(array);
       for (intptr_t i = 0; i < copy_len; i++) {
         utf16_array[i] = str_obj.CharAt(i);
       }
-      TwoByteString::SetPeer(str_obj, peer, cback);
+      TwoByteString::SetPeer(str_obj, external_size, peer, cback);
     }
     return str;
   }
-  return Api::NewHandle(T, str_obj.MakeExternal(array, length, peer, cback));
+  return Api::NewHandle(T, str_obj.MakeExternal(array, external_size,
+                                                peer, cback));
 }
 
 
 DART_EXPORT Dart_Handle Dart_StringGetProperties(Dart_Handle object,
                                                  intptr_t* char_size,
                                                  intptr_t* str_len,
                                                  void** peer) {
   Thread* thread = Thread::Current();
   CHECK_ISOLATE(thread->isolate());
   ReusableObjectHandleScope reused_obj_handle(thread);
@@ skipping 3962 matching lines @@
 
 DART_EXPORT bool Dart_IsPrecompiledRuntime() {
 #if defined(DART_PRECOMPILED_RUNTIME)
   return true;
 #else
   return false;
 #endif
 }
 
 }  // namespace dart