- Handle doubles transferred in message snapshots specially.

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 761 matching lines @@
   }
   if (object_id == kVoidType) {
     return Object::void_type();
   }
   if (object_id == kTrueValue) {
     return Bool::True().raw();
   }
   if (object_id == kFalseValue) {
     return Bool::False().raw();
   }
+  if (object_id == kDoubleObject) {
+    ASSERT(kind_ == Snapshot::kMessage);
+    return Double::New(ReadDouble());
+  }
   intptr_t class_id = ClassIdFromObjectId(object_id);
   if (IsSingletonClassId(class_id)) {
     return isolate()->class_table()->At(class_id);  // get singleton class.
   } else {
     ASSERT(Symbols::IsVMSymbolId(object_id));
     return Symbols::GetVMSymbol(object_id);  // return VM symbol.
   }
   UNREACHABLE();
   return Object::null();
 }
@@ skipping 409 matching lines @@
   // - Object that has already been written: (negative id in stream | 0x3)
 
   NoGCScope no_gc;
 
   // First check if it is a Smi (i.e not a heap object).
   if (!rawobj->IsHeapObject()) {
     Write<int64_t>(reinterpret_cast<intptr_t>(rawobj));
     return true;
   }
 
+  intptr_t cid = rawobj->GetClassId();
+
+  if ((kind_ == Snapshot::kMessage) && (cid == kDoubleCid)) {
+    WriteVMIsolateObject(kDoubleObject);
+    RawDouble* rd = reinterpret_cast<RawDouble*>(rawobj);
+    WriteDouble(rd->ptr()->value_);
+    return true;
+  }
+
   // Check if object has already been serialized, in that case just write
   // the object id out.
   uword tags = rawobj->ptr()->tags_;
   if (SerializedHeaderTag::decode(tags) == kObjectId) {
     intptr_t id = SerializedHeaderData::decode(tags);
     WriteIndexedObject(id);
     return true;
   }
 
   // Now check if it is an object from the VM isolate (NOTE: premarked objects
   // are considered to be objects in the VM isolate). These objects are shared
   // by all isolates.
   if (rawobj->IsVMHeapObject()) {
     HandleVMIsolateObject(rawobj);
     return true;
   }
 
   // Check if the object is a Mint and could potentially be a Smi
   // on other architectures (64 bit), if so write it out as int64_t value.
-  if (rawobj->GetClassId() == kMintCid) {
+  if (cid == kMintCid) {
     int64_t value = reinterpret_cast<RawMint*>(rawobj)->ptr()->value_;
     const intptr_t kSmi64Bits = 62;
     const int64_t kSmi64Max = (static_cast<int64_t>(1) << kSmi64Bits) - 1;
     const int64_t kSmi64Min = -(static_cast<int64_t>(1) << kSmi64Bits);
     if (value <= kSmi64Max && value >= kSmi64Min) {
       Write<int64_t>((value << kSmiTagShift) | kSmiTag);
       return true;
     }
   }
 
   // Check if it is a code object in that case just write a Null object
   // as we do not want code objects in the snapshot.
-  if (rawobj->GetClassId() == kCodeCid) {
+  if (cid == kCodeCid) {
     WriteVMIsolateObject(kNullObject);
     return true;
   }
 
   // Check if classes are not being serialized and it is preinitialized type
   // or a predefined internal VM class in the object store.
   if (kind_ != Snapshot::kFull) {
     // Check if it is an internal VM class which is in the object store.
-    if (rawobj->GetClassId() == kClassCid) {
+    if (cid == kClassCid) {
       RawClass* raw_class = reinterpret_cast<RawClass*>(rawobj);
       intptr_t class_id = raw_class->ptr()->id_;
       if (IsObjectStoreClassId(class_id)) {
         intptr_t object_id = ObjectIdFromClassId(class_id);
         WriteIndexedObject(object_id);
         return true;
       }
     }
 
     // Now check it is a preinitialized type object.
@@ skipping 297 matching lines @@
     NoGCScope no_gc;
     WriteObject(obj.raw());
     UnmarkAll();
   } else {
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart