Wire GrowableArray to use the internal VM object.

vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 1572 matching lines @@
     }
   }
   return Instance::null();
 }
 
 
 DART_EXPORT bool Dart_IsList(Dart_Handle object) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(object));
-  // TODO(5526318): Make access to GrowableObjectArray more efficient.
-  return (obj.IsArray() ||
+  return (obj.IsArray() || obj.IsGrowableObjectArray() ||
           (GetListInstance(isolate, obj) != Instance::null()));
 }
 
 
 DART_EXPORT Dart_Handle Dart_NewList(intptr_t length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   return Api::NewHandle(isolate, Array::New(length));
 }
 
 
+#define GET_LIST_LENGTH(isolate, type, obj, len)                               \
+  type& array = type::Handle(isolate);                                         \
+  array ^= obj.raw();                                                          \
+  *len = array.Length();                                                       \
+  return Api::Success(isolate);                                                \
+
+
 DART_EXPORT Dart_Handle Dart_ListLength(Dart_Handle list, intptr_t* len) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
   if (obj.IsByteArray()) {
-    ByteArray& byte_array = ByteArray::Handle(isolate);
-    byte_array ^= obj.raw();
-    *len = byte_array.Length();
-    return Api::Success(isolate);
+    GET_LIST_LENGTH(isolate, ByteArray, obj, len);
   }
   if (obj.IsArray()) {
-    Array& array_obj = Array::Handle(isolate);
-    array_obj ^= obj.raw();
-    *len = array_obj.Length();
-    return Api::Success(isolate);
+    GET_LIST_LENGTH(isolate, Array, obj, len);
   }
-  // TODO(5526318): Make access to GrowableObjectArray more efficient.
+  if (obj.IsGrowableObjectArray()) {
+    GET_LIST_LENGTH(isolate, GrowableObjectArray, obj, len);
+  }
   // Now check and handle a dart object that implements the List interface.
   const Instance& instance =
       Instance::Handle(isolate, GetListInstance(isolate, obj));
   if (instance.IsNull()) {
     return Api::NewError("Object does not implement the List inteface");
   }
   String& name = String::Handle(isolate, String::New("length"));
   name = Field::GetterName(name);
   const Function& function =
       Function::Handle(isolate, Resolver::ResolveDynamic(instance, name, 1, 0));
@@ skipping 22 matching lines @@
                            "maximum value that 'len' parameter can hold");
     }
   } else if (retval.IsError()) {
     return Api::NewHandle(isolate, retval.raw());
   } else {
     return Api::NewError("Length of List object is not an integer");
   }
 }
 
 
+#define GET_LIST_ELEMENT(isolate, type, obj, index)                            \
+  type& array_obj = type::Handle(isolate);                                     \
+  array_obj ^= obj.raw();                                                      \
+  if ((index >= 0) && (index < array_obj.Length())) {                          \
+    return Api::NewHandle(isolate, array_obj.At(index));                       \
+  }                                                                            \
+  return Api::NewError("Invalid index passed in to access list element");      \
+
+
 DART_EXPORT Dart_Handle Dart_ListGetAt(Dart_Handle list, intptr_t index) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
   if (obj.IsArray()) {
-    Array& array_obj = Array::Handle(isolate);
-    array_obj ^= obj.raw();
-    if ((index >= 0) && (index < array_obj.Length())) {
-      return Api::NewHandle(isolate, array_obj.At(index));
-    }
-    return Api::NewError("Invalid index passed in to access array element");
+    GET_LIST_ELEMENT(isolate, Array, obj, index);
   }
-  // TODO(5526318): Make access to GrowableObjectArray more efficient.
+  if (obj.IsGrowableObjectArray()) {
+    GET_LIST_ELEMENT(isolate, GrowableObjectArray, obj, index);
+  }
   // Now check and handle a dart object that implements the List interface.
   const Instance& instance =
       Instance::Handle(isolate, GetListInstance(isolate, obj));
   if (!instance.IsNull()) {
     String& name = String::Handle(isolate, String::New("[]"));
     const Function& function =
         Function::Handle(isolate,
                          Resolver::ResolveDynamic(instance, name, 2, 0));
     if (!function.IsNull()) {
       GrowableArray<const Object*> args(1);
       Integer& indexobj = Integer::Handle(isolate);
       indexobj = Integer::New(index);
       args.Add(&indexobj);
       const Array& kNoArgumentNames = Array::Handle(isolate);
       return Api::NewHandle(
           isolate,
           DartEntry::InvokeDynamic(instance, function, args, kNoArgumentNames));
     }
   }
   return Api::NewError("Object does not implement the 'List' interface");
 }
 
 
+#define SET_LIST_ELEMENT(isolate, type, obj, index, value)                     \
+  type& array = type::Handle(isolate);                                         \
+  array ^= obj.raw();                                                          \
+  const Object& value_obj = Object::Handle(isolate, Api::UnwrapHandle(value)); \
+  if ((index >= 0) && (index < array.Length())) {                              \
+    array.SetAt(index, value_obj);                                             \
+    return Api::Success(isolate);                                              \
+  }                                                                            \
+  return Api::NewError("Invalid index passed in to set list element");         \
+
+
 DART_EXPORT Dart_Handle Dart_ListSetAt(Dart_Handle list,
                                        intptr_t index,
                                        Dart_Handle value) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
   if (obj.IsArray()) {
     if (obj.IsImmutableArray()) {
       return Api::NewError("Cannot modify immutable array");
     }
-    Array& array_obj = Array::Handle(isolate);
-    array_obj ^= obj.raw();
-    const Object& value_obj = Object::Handle(isolate, Api::UnwrapHandle(value));
-    if ((index >= 0) && (index < array_obj.Length())) {
-      array_obj.SetAt(index, value_obj);
-      return Api::Success(isolate);
-    }
-    return Api::NewError("Invalid index passed in to set array element");
+    SET_LIST_ELEMENT(isolate, Array, obj, index, value);
   }
-  // TODO(5526318): Make access to GrowableObjectArray more efficient.
+  if (obj.IsGrowableObjectArray()) {
+    SET_LIST_ELEMENT(isolate, GrowableObjectArray, obj, index, value);
+  }
   // Now check and handle a dart object that implements the List interface.
   const Instance& instance =
       Instance::Handle(isolate, GetListInstance(isolate, obj));
   if (!instance.IsNull()) {
     String& name = String::Handle(isolate, String::New("[]="));
     const Function& function =
         Function::Handle(isolate,
                          Resolver::ResolveDynamic(instance, name, 3, 0));
     if (!function.IsNull()) {
       const Integer& index_obj = Integer::Handle(isolate, Integer::New(index));
       const Object& value_obj =
           Object::Handle(isolate, Api::UnwrapHandle(value));
       GrowableArray<const Object*> args(2);
       args.Add(&index_obj);
       args.Add(&value_obj);
       const Array& kNoArgumentNames = Array::Handle(isolate);
       return Api::NewHandle(
           isolate,
           DartEntry::InvokeDynamic(instance, function, args, kNoArgumentNames));
     }
   }
   return Api::NewError("Object does not implement the 'List' interface");
 }
 
 
+// TODO(hpayer): value should always be smaller then 0xff. Add error handling.
+#define GET_LIST_ELEMENT_AS_BYTES(isolate, type, obj, native_array, offset,    \
+                                   length)                                     \
+  type& array = type::Handle(isolate);                                         \
+  array ^= obj.raw();                                                          \
+  if (Utils::RangeCheck(offset, length, array.Length())) {                     \
+    Object& element = Object::Handle(isolate);                                 \
+    Integer& integer  = Integer::Handle(isolate);                              \
+    for (int i = 0; i < length; i++) {                                         \
+      element = array.At(offset + i);                                          \
+      if (!element.IsInteger()) {                                              \
+        return Api::NewError("%s expects the argument 'list' to be "           \
+                             "a List of int", CURRENT_FUNC);                   \
+      }                                                                        \
+      integer ^= element.raw();                                                \
+      native_array[i] = static_cast<uint8_t>(integer.AsInt64Value() & 0xff);   \
+      ASSERT(integer.AsInt64Value() <= 0xff);                                  \
+    }                                                                          \
+    return Api::Success(isolate);                                              \
+  }                                                                            \
+  return Api::NewError("Invalid length passed in to access array elements");   \
+
+
 DART_EXPORT Dart_Handle Dart_ListGetAsBytes(Dart_Handle list,
                                             intptr_t offset,
                                             uint8_t* native_array,
                                             intptr_t length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
   if (obj.IsByteArray()) {
     ByteArray& byte_array = ByteArray::Handle(isolate);
     byte_array ^= obj.raw();
     if (Utils::RangeCheck(offset, length, byte_array.Length())) {
       ByteArray::Copy(native_array, byte_array, offset, length);
       return Api::Success(isolate);
     }
     return Api::NewError("Invalid length passed in to access list elements");
   }
   if (obj.IsArray()) {
-    Array& array_obj = Array::Handle(isolate);
-    array_obj ^= obj.raw();
-    if (Utils::RangeCheck(offset, length, array_obj.Length())) {
-      Object& element = Object::Handle(isolate);
-      Integer& integer  = Integer::Handle(isolate);
-      for (int i = 0; i < length; i++) {
-        element = array_obj.At(offset + i);
-        if (!element.IsInteger()) {
-          return Api::NewError("%s expects the argument 'list' to be "
-                            "a List of int", CURRENT_FUNC);
-        }
-        integer ^= element.raw();
-        native_array[i] = static_cast<uint8_t>(integer.AsInt64Value() & 0xff);
-        ASSERT(integer.AsInt64Value() <= 0xff);
-        // TODO(hpayer): value should always be smaller then 0xff. Add error
-        // handling.
-      }
-      return Api::Success(isolate);
-    }
-    return Api::NewError("Invalid length passed in to access array elements");
+    GET_LIST_ELEMENT_AS_BYTES(isolate,
+                              Array,
+                              obj,
+                              native_array,
+                              offset,
+                              length);  }
+  if (obj.IsGrowableObjectArray()) {
+    GET_LIST_ELEMENT_AS_BYTES(isolate,
+                              GrowableObjectArray,
+                              obj,
+                              native_array,
+                              offset,
+                              length);
   }
-  // TODO(5526318): Make access to GrowableObjectArray more efficient.
   // Now check and handle a dart object that implements the List interface.
   const Instance& instance =
       Instance::Handle(isolate, GetListInstance(isolate, obj));
   if (!instance.IsNull()) {
     String& name = String::Handle(isolate, String::New("[]"));
     const Function& function =
         Function::Handle(isolate,
                          Resolver::ResolveDynamic(instance, name, 2, 0));
     if (!function.IsNull()) {
       Object& result = Object::Handle(isolate);
@@ skipping 18 matching lines @@
         // handling.
         native_array[i] = static_cast<uint8_t>(intobj.AsInt64Value() & 0xff);
       }
       return Api::Success(isolate);
     }
   }
   return Api::NewError("Object does not implement the 'List' interface");
 }
 
 
+#define SET_LIST_ELEMENT_AS_BYTES(isolate, type, obj, native_array, offset,    \
+                                  length)                                      \
+  type& array = type::Handle(isolate);                                         \
+  array ^= obj.raw();                                                          \
+  Integer& integer = Integer::Handle(isolate);                                 \
+  if (Utils::RangeCheck(offset, length, array.Length())) {                     \
+    for (int i = 0; i < length; i++) {                                         \
+      integer = Integer::New(native_array[i]);                                 \
+      array.SetAt(offset + i, integer);                                        \
+    }                                                                          \
+    return Api::Success(isolate);                                              \
+  }                                                                            \
+  return Api::NewError("Invalid length passed in to set array elements");      \
+
+
 DART_EXPORT Dart_Handle Dart_ListSetAsBytes(Dart_Handle list,
                                             intptr_t offset,
                                             uint8_t* native_array,
                                             intptr_t length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
   if (obj.IsByteArray()) {
     ByteArray& byte_array = ByteArray::Handle(isolate);
     byte_array ^= obj.raw();
     if (Utils::RangeCheck(offset, length, byte_array.Length())) {
       ByteArray::Copy(byte_array, offset, native_array, length);
       return Api::Success(isolate);
     }
     return Api::NewError("Invalid length passed in to set list elements");
   }
   if (obj.IsArray()) {
     if (obj.IsImmutableArray()) {
       return Api::NewError("Cannot modify immutable array");
     }
-    Array& array_obj = Array::Handle(isolate);
-    array_obj ^= obj.raw();
-    Integer& integer = Integer::Handle(isolate);
-    if (Utils::RangeCheck(offset, length, array_obj.Length())) {
-      for (int i = 0; i < length; i++) {
-        integer = Integer::New(native_array[i]);
-        array_obj.SetAt(offset + i, integer);
-      }
-      return Api::Success(isolate);
-    }
-    return Api::NewError("Invalid length passed in to set array elements");
+    SET_LIST_ELEMENT_AS_BYTES(isolate,
+                              Array,
+                              obj,
+                              native_array,
+                              offset,
+                              length);
   }
-  // TODO(5526318): Make access to GrowableObjectArray more efficient.
+  if (obj.IsGrowableObjectArray()) {
+    SET_LIST_ELEMENT_AS_BYTES(isolate,
+                              GrowableObjectArray,
+                              obj,
+                              native_array,
+                              offset,
+                              length);
+  }
   // Now check and handle a dart object that implements the List interface.
   const Instance& instance =
       Instance::Handle(isolate, GetListInstance(isolate, obj));
   if (!instance.IsNull()) {
     String& name = String::Handle(isolate, String::New("[]="));
     const Function& function =
         Function::Handle(isolate,
                          Resolver::ResolveDynamic(instance, name, 3, 0));
     if (!function.IsNull()) {
       Integer& indexobj = Integer::Handle(isolate);
@@ skipping 1487 matching lines @@
       *buffer = NULL;
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 }  // namespace dart