Remove support for 'dart:scalarlist' in the Dart VM.

runtime/vm/dart_api_impl.cc

Index: runtime/vm/dart_api_impl.cc
===================================================================
--- runtime/vm/dart_api_impl.cc	(revision 20600)
+++ runtime/vm/dart_api_impl.cc	(working copy)
@@ -1899,8 +1899,8 @@
     // Pass through errors.
     return list;
   }
-  if (obj.IsByteArray()) {
-    GET_LIST_LENGTH(isolate, ByteArray, obj, len);
+  if (obj.IsTypedData()) {
+    GET_LIST_LENGTH(isolate, TypedData, obj, len);
   }
   if (obj.IsArray()) {
     GET_LIST_LENGTH(isolate, Array, obj, len);
@@ -1908,6 +1908,9 @@
   if (obj.IsGrowableObjectArray()) {
     GET_LIST_LENGTH(isolate, GrowableObjectArray, obj, len);
   }
+  if (obj.IsExternalTypedData()) {
+    GET_LIST_LENGTH(isolate, ExternalTypedData, obj, len);
+  }
   CHECK_CALLBACK_STATE(isolate);
 
   // Now check and handle a dart object that implements the List interface.
@@ -2170,70 +2173,75 @@
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
-  if (obj.IsUint8Array() || obj.IsExternalUint8Array() ||
-      obj.IsUint8ClampedArray() || obj.IsExternalUint8ClampedArray() ||
-      obj.IsInt8Array() || obj.IsExternalInt8Array()) {
-    const ByteArray& byte_array = ByteArray::Cast(obj);
-    if (Utils::RangeCheck(offset, length, byte_array.Length())) {
-      ByteArray::Copy(native_array, byte_array, offset, length);
-      return Api::Success(isolate);
+  if (obj.IsTypedData()) {
+    const TypedData& array = TypedData::Cast(obj);
+    if (array.ElementSizeInBytes() == 1) {

[Ivan Posva, 2013/03/29 00:42:22]

So it is not possible to get the byte sized chunks out of say a Int16List, but
it is possible to get the truncated values out of a List of Smis?

[siva, 2013/03/29 18:02:33]

This code of getting truncated values out of a List of Smis below is a hack that
was added early on when socket read/write was happening using these lists. I
don't think we need it anymore. I would suggest we remove it so that we don't
have this kind of weird truncated access.

I will probably remove it in a different CL.

On 2013/03/29 00:42:22, Ivan Posva wrote:

+      if (Utils::RangeCheck(offset, length, array.Length())) {
+        NoGCScope no_gc;
+        memmove(native_array,
+                reinterpret_cast<uint8_t*>(array.DataAddr(offset)),
+                length);
+        return Api::Success(isolate);
+      }
+      return Api::NewError("Invalid length passed in to access list elements");
     }
-    return Api::NewError("Invalid length passed in to access list elements");
-  } else if (obj.IsArray()) {
+  }

[Ivan Posva, 2013/03/29 00:42:22]

Why did you go away from the if-else if-else if-else?

[siva, 2013/03/29 18:02:33]

I had to do it above because of the fall through in the TypedData case above
when the element size in bytes in not 1.

On 2013/03/29 00:42:22, Ivan Posva wrote:

+  if (obj.IsArray()) {
     GET_LIST_ELEMENT_AS_BYTES(isolate,
                               Array,
                               obj,
                               native_array,
                               offset,
                               length);
-  } else if (obj.IsGrowableObjectArray()) {
+  }
+  if (obj.IsGrowableObjectArray()) {
     GET_LIST_ELEMENT_AS_BYTES(isolate,
                               GrowableObjectArray,
                               obj,
                               native_array,
                               offset,
                               length);
-  } else if (obj.IsError()) {
+  }
+  if (obj.IsError()) {
     return list;
-  } else {
-    CHECK_CALLBACK_STATE(isolate);
+  }
+  CHECK_CALLBACK_STATE(isolate);
 
-    // Check and handle a dart object that implements the List interface.
-    const Instance& instance =
-        Instance::Handle(isolate, GetListInstance(isolate, obj));
-    if (!instance.IsNull()) {
-      const Function& function = Function::Handle(
-          isolate,
-          Resolver::ResolveDynamic(instance, Symbols::IndexToken(), 2, 0));
-      if (!function.IsNull()) {
-        Object& result = Object::Handle(isolate);
-        Integer& intobj = Integer::Handle(isolate);
-        const int kNumArgs = 2;
-        const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
-        args.SetAt(0, instance);  // Set up the receiver as the first argument.
-        for (int i = 0; i < length; i++) {
-          intobj = Integer::New(offset + i);
-          args.SetAt(1, intobj);
-          result = DartEntry::InvokeFunction(function, args);
-          if (result.IsError()) {
-            return Api::NewHandle(isolate, result.raw());
-          }
-          if (!result.IsInteger()) {
-            return Api::NewError("%s expects the argument 'list' to be "
-                                 "a List of int", CURRENT_FUNC);
-          }
-          const Integer& integer_result = Integer::Cast(result);
-          ASSERT(integer_result.AsInt64Value() <= 0xff);
-          // TODO(hpayer): value should always be smaller then 0xff. Add error
-          // handling.
-          native_array[i] =
-              static_cast<uint8_t>(integer_result.AsInt64Value() & 0xff);
+  // Check and handle a dart object that implements the List interface.
+  const Instance& instance =
+      Instance::Handle(isolate, GetListInstance(isolate, obj));
+  if (!instance.IsNull()) {
+    const Function& function = Function::Handle(
+        isolate,
+        Resolver::ResolveDynamic(instance, Symbols::IndexToken(), 2, 0));
+    if (!function.IsNull()) {
+      Object& result = Object::Handle(isolate);
+      Integer& intobj = Integer::Handle(isolate);
+      const int kNumArgs = 2;
+      const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
+      args.SetAt(0, instance);  // Set up the receiver as the first argument.
+      for (int i = 0; i < length; i++) {
+        intobj = Integer::New(offset + i);
+        args.SetAt(1, intobj);
+        result = DartEntry::InvokeFunction(function, args);
+        if (result.IsError()) {
+          return Api::NewHandle(isolate, result.raw());
         }
-        return Api::Success(isolate);
+        if (!result.IsInteger()) {
+          return Api::NewError("%s expects the argument 'list' to be "
+                               "a List of int", CURRENT_FUNC);
+        }
+        const Integer& integer_result = Integer::Cast(result);
+        ASSERT(integer_result.AsInt64Value() <= 0xff);
+        // TODO(hpayer): value should always be smaller then 0xff. Add error
+        // handling.
+        native_array[i] =
+            static_cast<uint8_t>(integer_result.AsInt64Value() & 0xff);
       }
+      return Api::Success(isolate);
     }
-    return Api::NewError("Object does not implement the 'List' interface");
   }
+  return Api::NewError("Object does not implement the 'List' interface");
 }
 
 
@@ -2258,15 +2266,20 @@
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(list));
-  if (obj.IsUint8Array() || obj.IsExternalUint8Array() ||
-      obj.IsUint8ClampedArray() || obj.IsExternalUint8ClampedArray()) {
-    const ByteArray& byte_array = ByteArray::Cast(obj);
-    if (Utils::RangeCheck(offset, length, byte_array.Length())) {
-      ByteArray::Copy(byte_array, offset, native_array, length);
-      return Api::Success(isolate);
+  if (obj.IsTypedData()) {
+    const TypedData& array = TypedData::Cast(obj);
+    if (array.ElementSizeInBytes() == 1) {

[Ivan Posva, 2013/03/29 00:42:22]

ditto

[siva, 2013/03/29 18:02:33]

I had to do it above because of the fall through in the TypedData case above
when the element size in bytes in not 1.


On 2013/03/29 00:42:22, Ivan Posva wrote:

+      if (Utils::RangeCheck(offset, length, array.Length())) {
+        NoGCScope no_gc;
+        memmove(reinterpret_cast<uint8_t*>(array.DataAddr(offset)),
+                native_array,
+                length);
+        return Api::Success(isolate);
+      }
+      return Api::NewError("Invalid length passed in to access list elements");
     }
-    return Api::NewError("Invalid length passed in to set list elements");
-  } else if (obj.IsArray() && !obj.IsImmutableArray()) {
+  }
+  if (obj.IsArray() && !obj.IsImmutableArray()) {
     // If the list is immutable we call into Dart for the indexed setter to
     // get the unsupported operation exception as the result.
     SET_LIST_ELEMENT_AS_BYTES(isolate,
@@ -2275,50 +2288,51 @@
                               native_array,
                               offset,
                               length);
-  } else if (obj.IsGrowableObjectArray()) {
+  }
+  if (obj.IsGrowableObjectArray()) {
     SET_LIST_ELEMENT_AS_BYTES(isolate,
                               GrowableObjectArray,
                               obj,
                               native_array,
                               offset,
                               length);
-  } else if (obj.IsError()) {
+  }
+  if (obj.IsError()) {
     return list;
-  } else {
-    CHECK_CALLBACK_STATE(isolate);
+  }
+  CHECK_CALLBACK_STATE(isolate);
 
-    // Check and handle a dart object that implements the List interface.
-    const Instance& instance =
-        Instance::Handle(isolate, GetListInstance(isolate, obj));
-    if (!instance.IsNull()) {
-      const Function& function = Function::Handle(
-          isolate,
-          Resolver::ResolveDynamic(instance,
-                                   Symbols::AssignIndexToken(),
-                                   3,
-                                   0));
-      if (!function.IsNull()) {
-        Integer& indexobj = Integer::Handle(isolate);
-        Integer& valueobj = Integer::Handle(isolate);
-        const int kNumArgs = 3;
-        const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
-        args.SetAt(0, instance);  // Set up the receiver as the first argument.
-        for (int i = 0; i < length; i++) {
-          indexobj = Integer::New(offset + i);
-          valueobj = Integer::New(native_array[i]);
-          args.SetAt(1, indexobj);
-          args.SetAt(2, valueobj);
-          const Object& result = Object::Handle(
-              isolate, DartEntry::InvokeFunction(function, args));
-          if (result.IsError()) {
-            return Api::NewHandle(isolate, result.raw());
-          }
+  // Check and handle a dart object that implements the List interface.
+  const Instance& instance =
+      Instance::Handle(isolate, GetListInstance(isolate, obj));
+  if (!instance.IsNull()) {
+    const Function& function = Function::Handle(
+        isolate,
+        Resolver::ResolveDynamic(instance,
+                                 Symbols::AssignIndexToken(),
+                                 3,
+                                 0));
+    if (!function.IsNull()) {
+      Integer& indexobj = Integer::Handle(isolate);
+      Integer& valueobj = Integer::Handle(isolate);
+      const int kNumArgs = 3;
+      const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
+      args.SetAt(0, instance);  // Set up the receiver as the first argument.
+      for (int i = 0; i < length; i++) {
+        indexobj = Integer::New(offset + i);
+        valueobj = Integer::New(native_array[i]);
+        args.SetAt(1, indexobj);
+        args.SetAt(2, valueobj);
+        const Object& result = Object::Handle(
+            isolate, DartEntry::InvokeFunction(function, args));
+        if (result.IsError()) {
+          return Api::NewHandle(isolate, result.raw());
         }
-        return Api::Success(isolate);
       }
+      return Api::Success(isolate);
     }
-    return Api::NewError("Object does not implement the 'List' interface");
   }
+  return Api::NewError("Object does not implement the 'List' interface");
 }