Add support for more typed data types on native ports

runtime/vm/snapshot_test.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_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_message.h"
@@ skipping 73 matching lines @@
       break;
     case Dart_CObject::kBigint:
       EXPECT_STREQ(first->value.as_bigint, second->value.as_bigint);
       break;
     case Dart_CObject::kDouble:
       EXPECT_EQ(first->value.as_double, second->value.as_double);
       break;
     case Dart_CObject::kString:
       EXPECT_STREQ(first->value.as_string, second->value.as_string);
       break;
-    case Dart_CObject::kUint8Array:
-      EXPECT_EQ(first->value.as_byte_array.length,
-                second->value.as_byte_array.length);
-      for (int i = 0; i < first->value.as_byte_array.length; i++) {
-        EXPECT_EQ(first->value.as_byte_array.values[i],
-                  second->value.as_byte_array.values[i]);
+    case Dart_CObject::kTypedData:
+      EXPECT_EQ(first->value.as_typed_data.length,
+                second->value.as_typed_data.length);
+      for (int i = 0; i < first->value.as_typed_data.length; i++) {
+        EXPECT_EQ(first->value.as_typed_data.values[i],
+                  second->value.as_typed_data.values[i]);
       }
       break;
     case Dart_CObject::kArray:
       // Use invalid type as a visited marker to avoid infinite
       // recursion on graphs with cycles.
       second->type = Dart_CObject::kNumberOfTypes;
       EXPECT_EQ(first->value.as_array.length, second->value.as_array.length);
       for (int i = 0; i < first->value.as_array.length; i++) {
         CompareDartCObjects(first->value.as_array.values[i],
                             second->value.as_array.values[i]);
@@ skipping 495 matching lines @@
   CheckEncodeDecodeMessage(root);
 }
 
 
 TEST_CASE(SerializeByteArray) {
   StackZone zone(Isolate::Current());
 
   // Write snapshot with object content.
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator);
-  const int kByteArrayLength = 256;
-  TypedData& byte_array = TypedData::Handle(
-      TypedData::New(kTypedDataUint8ArrayCid, kByteArrayLength));
-  for (int i = 0; i < kByteArrayLength; i++) {
-    byte_array.SetUint8(i, i);
+  const int kTypedDataLength = 256;
+  TypedData& typed_data = TypedData::Handle(
+      TypedData::New(kTypedDataUint8ArrayCid, kTypedDataLength));
+  for (int i = 0; i < kTypedDataLength; i++) {
+    typed_data.SetUint8(i, i);
   }
-  writer.WriteMessage(byte_array);
+  writer.WriteMessage(typed_data);
   intptr_t buffer_len = writer.BytesWritten();
 
   // Read object back from the snapshot.
   SnapshotReader reader(buffer, buffer_len,
                         Snapshot::kMessage, Isolate::Current());
-  TypedData& serialized_byte_array = TypedData::Handle();
-  serialized_byte_array ^= reader.ReadObject();
-  EXPECT(serialized_byte_array.IsTypedData());
+  TypedData& serialized_typed_data = TypedData::Handle();
+  serialized_typed_data ^= reader.ReadObject();
+  EXPECT(serialized_typed_data.IsTypedData());
 
   // Read object back from the snapshot into a C structure.
   ApiNativeScope scope;
   ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);
   Dart_CObject* root = api_reader.ReadMessage();
-  EXPECT_EQ(Dart_CObject::kUint8Array, root->type);
-  EXPECT_EQ(kByteArrayLength, root->value.as_byte_array.length);
-  for (int i = 0; i < kByteArrayLength; i++) {
-    EXPECT(root->value.as_byte_array.values[i] == i);
+  EXPECT_EQ(Dart_CObject::kTypedData, root->type);
+  EXPECT_EQ(kTypedDataLength, root->value.as_typed_data.length);
+  for (int i = 0; i < kTypedDataLength; i++) {
+    EXPECT(root->value.as_typed_data.values[i] == i);
   }
   CheckEncodeDecodeMessage(root);
 }
 
 
 #define TEST_TYPED_ARRAY(darttype, ctype)                                     \
   {                                                                           \
     StackZone zone(Isolate::Current());                                       \
     uint8_t* buffer;                                                          \
     MessageWriter writer(&buffer, &zone_allocator);                           \
@@ skipping 68 matching lines @@
   TEST_EXTERNAL_TYPED_ARRAY(Float64, double);
 }
 
 
 TEST_CASE(SerializeEmptyByteArray) {
   StackZone zone(Isolate::Current());
 
   // Write snapshot with object content.
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator);
-  const int kByteArrayLength = 0;
-  TypedData& byte_array = TypedData::Handle(
-      TypedData::New(kTypedDataUint8ArrayCid, kByteArrayLength));
-  writer.WriteMessage(byte_array);
+  const int kTypedDataLength = 0;
+  TypedData& typed_data = TypedData::Handle(
+      TypedData::New(kTypedDataUint8ArrayCid, kTypedDataLength));
+  writer.WriteMessage(typed_data);
   intptr_t buffer_len = writer.BytesWritten();
 
   // Read object back from the snapshot.
   SnapshotReader reader(buffer, buffer_len,
                         Snapshot::kMessage, Isolate::Current());
-  TypedData& serialized_byte_array = TypedData::Handle();
-  serialized_byte_array ^= reader.ReadObject();
-  EXPECT(serialized_byte_array.IsTypedData());
+  TypedData& serialized_typed_data = TypedData::Handle();
+  serialized_typed_data ^= reader.ReadObject();
+  EXPECT(serialized_typed_data.IsTypedData());
 
   // Read object back from the snapshot into a C structure.
   ApiNativeScope scope;
   ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);
   Dart_CObject* root = api_reader.ReadMessage();
-  EXPECT_EQ(Dart_CObject::kUint8Array, root->type);
-  EXPECT_EQ(kByteArrayLength, root->value.as_byte_array.length);
-  EXPECT(root->value.as_byte_array.values == NULL);
+  EXPECT_EQ(Dart_CObject::kTypedData, root->type);
+  EXPECT_EQ(Dart_CObject::kUint8Array, root->value.as_typed_data.type);
+  EXPECT_EQ(kTypedDataLength, root->value.as_typed_data.length);
+  EXPECT(root->value.as_typed_data.values == NULL);
   CheckEncodeDecodeMessage(root);
 }
 
 
 class TestSnapshotWriter : public SnapshotWriter {
  public:
   static const intptr_t kInitialSize = 64 * KB;
   TestSnapshotWriter(uint8_t** buffer, ReAlloc alloc)
       : SnapshotWriter(Snapshot::kScript, buffer, alloc, kInitialSize) {
     ASSERT(buffer != NULL);
@@ skipping 1144 matching lines @@
     {
       // Generate a list of Uint8Lists from Dart code.
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserializedDartMessage(lib, "getTypedDataList");
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject::kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         Dart_CObject* element = root->value.as_array.values[i];
         EXPECT_EQ(root->value.as_array.values[0], element);
-        EXPECT_EQ(Dart_CObject::kUint8Array, element->type);
-        EXPECT_EQ(256, element->value.as_byte_array.length);
+        EXPECT_EQ(Dart_CObject::kTypedData, element->type);
+        EXPECT_EQ(Dart_CObject::kUint8Array, element->value.as_typed_data.type);
+        EXPECT_EQ(256, element->value.as_typed_data.length);
       }
     }
     {
       // Generate a list of Uint8List views from Dart code.
       ApiNativeScope scope;
       Dart_CObject* root =
           GetDeserializedDartMessage(lib, "getTypedDataViewList");
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject::kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         Dart_CObject* element = root->value.as_array.values[i];
         EXPECT_EQ(root->value.as_array.values[0], element);
-        EXPECT_EQ(Dart_CObject::kUint8Array, element->type);
-        EXPECT_EQ(128, element->value.as_byte_array.length);
-        EXPECT_EQ(1, element->value.as_byte_array.values[0]);
-        EXPECT_EQ(0, element->value.as_byte_array.values[1]);
+        EXPECT_EQ(Dart_CObject::kTypedData, element->type);
+        EXPECT_EQ(Dart_CObject::kUint8Array, element->value.as_typed_data.type);
+        EXPECT_EQ(128, element->value.as_typed_data.length);
+        EXPECT_EQ(1, element->value.as_typed_data.values[0]);
+        EXPECT_EQ(0, element->value.as_typed_data.values[1]);
       }
     }
     {
       // Generate a list of objects of different types from Dart code.
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserializedDartMessage(lib, "getMixedList");
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject::kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
@@ skipping 163 matching lines @@
     {
       // Generate a list of Uint8Lists from Dart code.
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserializedDartMessage(lib, "getTypedDataList");
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject::kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         Dart_CObject* element = root->value.as_array.values[i];
         EXPECT_EQ(root->value.as_array.values[0], element);
-        EXPECT_EQ(Dart_CObject::kUint8Array, element->type);
-        EXPECT_EQ(256, element->value.as_byte_array.length);
+        EXPECT_EQ(Dart_CObject::kTypedData, element->type);
+        EXPECT_EQ(Dart_CObject::kUint8Array, element->value.as_typed_data.type);
+        EXPECT_EQ(256, element->value.as_typed_data.length);
       }
     }
     {
       // Generate a list of Uint8List views from Dart code.
       ApiNativeScope scope;
       Dart_CObject* root =
           GetDeserializedDartMessage(lib, "getTypedDataViewList");
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject::kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         Dart_CObject* element = root->value.as_array.values[i];
         EXPECT_EQ(root->value.as_array.values[0], element);
-        EXPECT_EQ(Dart_CObject::kUint8Array, element->type);
-        EXPECT_EQ(128, element->value.as_byte_array.length);
-        EXPECT_EQ(1, element->value.as_byte_array.values[0]);
-        EXPECT_EQ(0, element->value.as_byte_array.values[1]);
+        EXPECT_EQ(Dart_CObject::kTypedData, element->type);
+        EXPECT_EQ(Dart_CObject::kUint8Array, element->value.as_typed_data.type);
+        EXPECT_EQ(128, element->value.as_typed_data.length);
+        EXPECT_EQ(1, element->value.as_typed_data.values[0]);
+        EXPECT_EQ(0, element->value.as_typed_data.values[1]);
       }
     }
     {
       // Generate a list of objects of different types from Dart code.
       ApiNativeScope scope;
       Dart_CObject* root = GetDeserializedDartMessage(lib, "getMixedList");
       EXPECT_NOTNULL(root);
       EXPECT_EQ(Dart_CObject::kArray, root->type);
       EXPECT_EQ(kArrayLength, root->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
@@ skipping 21 matching lines @@
         EXPECT_EQ(Dart_CObject::kArray, element->type);
         EXPECT_EQ(root, element);
       }
     }
   }
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
+static void CheckTypedData(Dart_CObject* object,
+                           Dart_CObject::TypedDataType typed_data_type,
+                           int len) {
+    EXPECT_EQ(Dart_CObject::kTypedData, object->type);
+    EXPECT_EQ(typed_data_type, object->value.as_typed_data.type);
+    EXPECT_EQ(len, object->value.as_typed_data.length);
+}
+
+UNIT_TEST_CASE(DartGeneratedListMessagesWithTypedData) {
+  const int kArrayLength = 10;
+  static const char* kScriptChars =
+      "import 'dart:typeddata';\n"
+      "final int kArrayLength = 10;\n"
+      "getTypedDataList() {\n"
+      "  var list = new List(kArrayLength);\n"
+      "  list[0] = new Int8List(256);\n"
+      "  list[1] = new Uint8List(256);\n"
+      "  list[2] = new Int16List(256);\n"
+      "  list[3] = new Uint16List(256);\n"
+      "  return list;\n"
+      "}\n"
+      "getTypedDataViewList() {\n"
+      "  var list = new List(kArrayLength);\n"
+      "  list[0] = new Int8List.view(new Int8List(256));\n"
+      "  list[1] = new Uint8List.view(new Uint8List(256));\n"
+      "  list[2] = new Int16List.view(new Int16List(256));\n"
+      "  list[3] = new Uint16List.view(new Uint16List(256));\n"
+      "  list[4] = new Int8List.view(new Int16List(256));\n"
+      "  list[5] = new Uint8List.view(new Uint16List(256));\n"
+      "  list[6] = new Int16List.view(new Int8List(256));\n"
+      "  list[7] = new Uint16List.view(new Uint8List(256));\n"
+      "  return list;\n"
+      "}\n";
+
+  TestCase::CreateTestIsolate();
+  Isolate* isolate = Isolate::Current();
+  EXPECT(isolate != NULL);
+  Dart_EnterScope();
+
+  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
+  EXPECT_VALID(lib);
+
+  {
+    DARTSCOPE(isolate);
+    {
+      // Generate a list of Uint8Lists from Dart code.
+      ApiNativeScope scope;
+      Dart_CObject* root = GetDeserializedDartMessage(lib, "getTypedDataList");
+      EXPECT_NOTNULL(root);
+      EXPECT_EQ(Dart_CObject::kArray, root->type);
+      EXPECT_EQ(kArrayLength, root->value.as_array.length);
+      CheckTypedData(root->value.as_array.values[0],
+                     Dart_CObject::kInt8Array,
+                     256);
+      CheckTypedData(root->value.as_array.values[1],
+                     Dart_CObject::kUint8Array,
+                     256);
+      CheckTypedData(root->value.as_array.values[2],
+                     Dart_CObject::kInt16Array,
+                     512);
+      CheckTypedData(root->value.as_array.values[3],
+                     Dart_CObject::kUint16Array,
+                     512);
+    }
+    {
+      // Generate a list of Uint8List views from Dart code.
+      ApiNativeScope scope;
+      Dart_CObject* root =
+          GetDeserializedDartMessage(lib, "getTypedDataViewList");
+      EXPECT_NOTNULL(root);
+      EXPECT_EQ(Dart_CObject::kArray, root->type);
+      EXPECT_EQ(kArrayLength, root->value.as_array.length);
+      CheckTypedData(root->value.as_array.values[0],
+                     Dart_CObject::kInt8Array,
+                     256);
+      CheckTypedData(root->value.as_array.values[1],
+                     Dart_CObject::kUint8Array,
+                     256);
+      CheckTypedData(root->value.as_array.values[2],
+                     Dart_CObject::kInt16Array,
+                     512);
+      CheckTypedData(root->value.as_array.values[3],
+                     Dart_CObject::kUint16Array,
+                     512);
+      CheckTypedData(root->value.as_array.values[4],
+                     Dart_CObject::kInt8Array,
+                     512);
+      CheckTypedData(root->value.as_array.values[5],
+                     Dart_CObject::kUint8Array,
+                     512);
+      CheckTypedData(root->value.as_array.values[6],
+                     Dart_CObject::kInt16Array,
+                     256);
+      CheckTypedData(root->value.as_array.values[7],
+                     Dart_CObject::kUint16Array,
+                     256);
+    }
+  }
+  Dart_ExitScope();
+  Dart_ShutdownIsolate();
+}
+
+
 UNIT_TEST_CASE(PostCObject) {
   // Create a native port for posting from C to Dart
   TestIsolateScope __test_isolate__;
   const char* kScriptChars =
       "import 'dart:isolate';\n"
       "main() {\n"
       "  var messageCount = 0;\n"
       "  var exception = '';\n"
       "  var port = new ReceivePort();\n"
       "  port.receive((message, replyTo) {\n"
@@ skipping 80 matching lines @@
   EXPECT(Dart_ErrorHasException(result));
   EXPECT_SUBSTRING("Exception: nulltruefalse123456æøå3.14[]100123456789\n",
                    Dart_GetError(result));
 
   Dart_ExitScope();
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart