Handle TypedDataView objects in Dart_TypedDataAcquireData and

runtime/vm/snapshot.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 "vm/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 36 matching lines @@
 
 static intptr_t ClassIdFromObjectId(intptr_t object_id) {
   ASSERT(object_id > kClassIdsOffset);
   intptr_t class_id = (object_id - kClassIdsOffset);
   return class_id;
 }
 
 
 static intptr_t ObjectIdFromClassId(intptr_t class_id) {
   ASSERT((class_id > kIllegalCid) && (class_id < kNumPredefinedCids));
+  ASSERT(!RawObject::IsTypedDataViewClassId(class_id));
   return (class_id + kClassIdsOffset);
 }
 
 
 static RawType* GetType(ObjectStore* object_store, int index) {
   switch (index) {
     case kObjectType: return object_store->object_type();
     case kNullType: return object_store->null_type();
     case kDynamicType: return object_store->dynamic_type();
     case kVoidType: return object_store->void_type();
@@ skipping 851 matching lines @@
 void SnapshotWriter::WriteObjectRef(RawObject* raw) {
   // First check if object can be written as a simple predefined type.
   if (CheckAndWritePredefinedObject(raw)) {
     return;
   }
 
   NoGCScope no_gc;
   RawClass* cls = class_table_->At(raw->GetClassId());
   intptr_t class_id = cls->ptr()->id_;
   ASSERT(class_id == raw->GetClassId());
-  if (class_id >= kNumPredefinedCids) {
+  if (class_id >= kNumPredefinedCids ||
+      RawObject::IsTypedDataViewClassId(class_id)) {
     if (Class::IsSignatureClass(cls)) {
       // We do not allow closure objects in an isolate message.
       set_exception_type(Exceptions::kArgument);
       // TODO(6726): Allocate these constant strings once in the VM isolate.
       set_exception_msg("Illegal argument in isolate message"
                         " : (object is a closure)");
       Isolate::Current()->long_jump_base()->Jump(1, *ErrorHandle());
     }
     // Object is being referenced, add it to the forward ref list and mark
     // it so that future references to this object in the snapshot will use
@@ skipping 251 matching lines @@
   //    serialized fields of the object
   //    ......
   NoGCScope no_gc;
   uword tags = raw->ptr()->tags_;
   ASSERT(SerializedHeaderTag::decode(tags) == kObjectId);
   intptr_t object_id = SerializedHeaderData::decode(tags);
   tags = forward_list_[object_id - kMaxPredefinedObjectIds]->tags();
   RawClass* cls = class_table_->At(RawObject::ClassIdTag::decode(tags));
   intptr_t class_id = cls->ptr()->id_;
 
-  if (class_id >= kNumPredefinedCids) {
+  if (class_id >= kNumPredefinedCids ||
+      RawObject::IsTypedDataViewClassId(class_id)) {

[Ivan Posva, 2013/03/22 04:50:01]

ditto

[siva, 2013/03/25 17:20:35]

Made the same code changes.

On 2013/03/22 04:50:01, Ivan Posva wrote:

     if (Class::IsSignatureClass(cls)) {
       // We do not allow closure objects in an isolate message.
       set_exception_type(Exceptions::kArgument);
       // TODO(6726): Allocate these constant strings once in the VM isolate.
       set_exception_msg("Illegal argument in isolate message"
                         " : (object is a closure)");
       Isolate::Current()->long_jump_base()->Jump(1, *ErrorHandle());
     }
     if (cls->ptr()->num_native_fields_ != 0) {
       // We do not allow objects with native fields in an isolate message.
@@ skipping 203 matching lines @@
     UnmarkAll();
     isolate->set_long_jump_base(base);
   } else {
     isolate->set_long_jump_base(base);
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart