- Change the layout of external typed array objects to avoid the extra indirection when accessing e…

runtime/bin/dartutils.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 "bin/dartutils.h"
 
 #include "bin/extensions.h"
 #include "bin/directory.h"
 #include "bin/file.h"
 #include "bin/io_buffer.h"
@@ skipping 646 matching lines @@
 
 
 Dart_CObject* CObject::NewUint8Array(int length) {
   Dart_CObject* cobject = New(Dart_CObject::kUint8Array, length);
   cobject->value.as_byte_array.length = length;
   cobject->value.as_byte_array.values = reinterpret_cast<uint8_t*>(cobject + 1);
   return cobject;
 }
 
 
-Dart_CObject* CObject::NewExternalUint8Array(int64_t length,
-                                             uint8_t* data,
-                                             void* peer,
-                                             Dart_PeerFinalizer callback) {
+Dart_CObject* CObject::NewExternalUint8Array(
+    int64_t length, uint8_t* data, void* peer,
+    Dart_WeakPersistentHandleFinalizer callback) {
   Dart_CObject* cobject = New(Dart_CObject::kExternalUint8Array);
   cobject->value.as_external_byte_array.length = length;
   cobject->value.as_external_byte_array.data = data;
   cobject->value.as_external_byte_array.peer = peer;
   cobject->value.as_external_byte_array.callback = callback;
   return cobject;
 }
 
 
 Dart_CObject* CObject::NewIOBuffer(int64_t length) {
   uint8_t* data = IOBuffer::Allocate(length);
-  return NewExternalUint8Array(length, data, data, IOBuffer::Free);
+  return NewExternalUint8Array(length, data, data, IOBuffer::Finalizer);
 }
 
 
 void CObject::FreeIOBufferData(Dart_CObject* cobject) {
   ASSERT(cobject->type == Dart_CObject::kExternalUint8Array);
   cobject->value.as_external_byte_array.callback(
-      cobject->value.as_external_byte_array.peer);
+      NULL, cobject->value.as_external_byte_array.peer);
   cobject->value.as_external_byte_array.data = NULL;
 }
 
 
 static int kArgumentError = 1;
 static int kOSError = 2;
 static int kFileClosedError = 3;
 
 
 CObject* CObject::IllegalArgumentError() {
@@ skipping 17 matching lines @@
 
 CObject* CObject::NewOSError(OSError* os_error) {
   CObject* error_message =
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }