- Make Boolean 'true' and 'false' singleton VM isolate objects.

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/exceptions.h"
@@ skipping 643 matching lines @@
   if (object_id == kNullObject) {
     // This is a singleton null object, return it.
     return Object::null();
   }
   if (object_id == kSentinelObject) {
     return Object::sentinel().raw();
   }
   if (object_id == kEmptyArrayObject) {
     return Object::empty_array().raw();
   }
+  if (object_id == kTrueValue) {
+    return Bool::True().raw();
+  }
+  if (object_id == kFalseValue) {
+    return Bool::False().raw();
+  }
   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();
 }
 
 
 RawObject* SnapshotReader::ReadIndexedObject(intptr_t object_id) {
-  if (object_id == kTrueValue) {
-    return object_store()->true_value();
-  }
-  if (object_id == kFalseValue) {
-    return object_store()->false_value();
-  }
   intptr_t class_id = ClassIdFromObjectId(object_id);
   if (IsObjectStoreClassId(class_id)) {
     return isolate()->class_table()->At(class_id);  // get singleton class.
   }
   if (kind_ != Snapshot::kFull) {
     if (IsObjectStoreTypeId(object_id)) {
       return GetType(object_store(), object_id);  // return type obj.
     }
   }
   Object* object = GetBackRef(object_id);
@@ skipping 112 matching lines @@
     WriteVMIsolateObject(kSentinelObject);
     return;
   }
 
   // Check if it is a singleton empty array object.
   if (rawobj == Object::empty_array().raw()) {
     WriteVMIsolateObject(kEmptyArrayObject);
     return;
   }
 
+  // Check if it is a singleton boolean true object.
+  if (rawobj == Bool::True().raw()) {
+    WriteVMIsolateObject(kTrueValue);
+    return;
+  }
+
+  // Check if it is a singleton boolean false object.
+  if (rawobj == Bool::False().raw()) {
+    WriteVMIsolateObject(kFalseValue);
+    return;
+  }
+
   // Check if it is a singleton class object which is shared by
   // all isolates.
   intptr_t id = rawobj->GetClassId();
   if (id == kClassCid) {
     RawClass* raw_class = reinterpret_cast<RawClass*>(rawobj);
     intptr_t class_id = raw_class->ptr()->id_;
     if (IsSingletonClassId(class_id)) {
       intptr_t object_id = ObjectIdFromClassId(class_id);
       WriteVMIsolateObject(object_id);
       return;
@@ skipping 207 matching lines @@
   }
 
   // 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->IsMarked()) {
     HandleVMIsolateObject(rawobj);
     return true;
   }
 
-  // Check if it is a singleton boolean true value.
-  if (rawobj == object_store()->true_value()) {
-    WriteIndexedObject(kTrueValue);
-    return true;
-  }
-
-  // Check if it is a singleton boolean false value.
-  if (rawobj == object_store()->false_value()) {
-    WriteIndexedObject(kFalseValue);
-    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) {
     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;
@@ skipping 251 matching lines @@
     UnmarkAll();
     isolate->set_long_jump_base(base);
   } else {
     isolate->set_long_jump_base(base);
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart