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

vm/dart_api_message.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/dart_api_message.h"
 #include "vm/object.h"
 #include "vm/snapshot_ids.h"
 #include "vm/symbols.h"
 #include "vm/unicode.h"
 
@@ skipping 197 matching lines @@
       value->value.as_array.values[i] = ReadObjectRef();
     }
     return value;
   }
 
   return ReadInternalVMObject(class_id, object_id);
 }
 
 
 Dart_CObject* ApiMessageReader::ReadVMSymbol(intptr_t object_id) {
-  if (Symbols::IsVMSymbolId(object_id)) {
-    intptr_t symbol_id = object_id - kMaxPredefinedObjectIds;
-    Dart_CObject* object;
-    if (vm_symbol_references_ != NULL &&
-        (object = vm_symbol_references_[symbol_id]) != NULL) {
-      return object;
-    }
-
-    if (vm_symbol_references_ == NULL) {
-      intptr_t size =
-          (sizeof(*vm_symbol_references_) * Symbols::kMaxPredefinedId);
-      vm_symbol_references_ =
-          reinterpret_cast<Dart_CObject**>(alloc_(NULL, 0, size));
-      memset(vm_symbol_references_, 0, size);
-    }
-
-    RawOneByteString* str =
-        reinterpret_cast<RawOneByteString*>(Symbols::GetVMSymbol(object_id));
-    intptr_t len = Smi::Value(str->ptr()->length_);
-    object = AllocateDartCObjectString(len);
-    char* p = object->value.as_string;
-    memmove(p, str->ptr()->data_, len);
-    p[len] = '\0';
-    ASSERT(vm_symbol_references_[symbol_id] == NULL);
-    vm_symbol_references_[symbol_id] = object;
+  ASSERT(Symbols::IsVMSymbolId(object_id));
+  intptr_t symbol_id = object_id - kMaxPredefinedObjectIds;
+  Dart_CObject* object;
+  if (vm_symbol_references_ != NULL &&
+      (object = vm_symbol_references_[symbol_id]) != NULL) {
     return object;
   }
-  // No other VM isolate objects are supported.
-  return AllocateDartCObjectNull();
+
+  if (vm_symbol_references_ == NULL) {
+    intptr_t size =
+        (sizeof(*vm_symbol_references_) * Symbols::kMaxPredefinedId);
+    vm_symbol_references_ =
+        reinterpret_cast<Dart_CObject**>(alloc_(NULL, 0, size));
+    memset(vm_symbol_references_, 0, size);
+  }
+
+  RawOneByteString* str =
+      reinterpret_cast<RawOneByteString*>(Symbols::GetVMSymbol(object_id));
+  intptr_t len = Smi::Value(str->ptr()->length_);
+  object = AllocateDartCObjectString(len);
+  char* p = object->value.as_string;
+  memmove(p, str->ptr()->data_, len);
+  p[len] = '\0';
+  ASSERT(vm_symbol_references_[symbol_id] == NULL);
+  vm_symbol_references_[symbol_id] = object;
+  return object;
 }
 
 
 Dart_CObject* ApiMessageReader::ReadObjectRef() {
   int64_t value = Read<int64_t>();
   if ((value & kSmiTagMask) == 0) {
     int64_t untagged_value = value >> kSmiTagShift;
     if (kMinInt32 <= untagged_value && untagged_value <= kMaxInt32) {
       return AllocateDartCObjectInt32(untagged_value);
     } else {
       return AllocateDartCObjectInt64(untagged_value);
     }
   }
   ASSERT((value <= kIntptrMax) && (value >= kIntptrMin));
   if (IsVMIsolateObject(value)) {
-    intptr_t object_id = GetVMIsolateObjectId(value);
-    if (object_id == kNullObject) {
-      return AllocateDartCObjectNull();
-    }
-    return ReadVMSymbol(object_id);
+    return ReadVMIsolateObject(value);
   }
   if (SerializedHeaderTag::decode(value) == kObjectId) {
     return ReadIndexedObject(SerializedHeaderData::decode(value));
   }
   ASSERT(SerializedHeaderTag::decode(value) == kInlined);
   // Read the class header information and lookup the class.
   intptr_t class_header = ReadIntptrValue();
 
   // Reading of regular dart instances is not supported.
   if (SerializedHeaderData::decode(class_header) == kInstanceObjectId) {
@@ skipping 10 matching lines @@
     return value;
   }
 
   intptr_t tags = ReadIntptrValue();
   USE(tags);
 
   return ReadInternalVMObject(class_id, object_id);
 }
 
 
+Dart_CObject* ApiMessageReader::ReadVMIsolateObject(intptr_t value) {
+  intptr_t object_id = GetVMIsolateObjectId(value);
+  if (object_id == kNullObject) {
+    return AllocateDartCObjectNull();
+  }
+  if (object_id == kTrueValue) {
+    return AllocateDartCObjectBool(true);
+  }
+  if (object_id == kFalseValue) {
+    return AllocateDartCObjectBool(false);
+  }
+  if (Symbols::IsVMSymbolId(object_id)) {
+    return ReadVMSymbol(object_id);
+  }
+  // No other VM isolate objects are supported.
+  return AllocateDartCObjectNull();
+}
+
+
 Dart_CObject* ApiMessageReader::ReadInternalVMObject(intptr_t class_id,
                                                      intptr_t object_id) {
   switch (class_id) {
     case kClassCid: {
       return AllocateDartCObjectUnsupported();
     }
     case kTypeArgumentsCid: {
       // TODO(sjesse): Remove this when message serialization format is
       // updated (currently length is leaked).
       Dart_CObject* value = &type_arguments_marker;
@@ skipping 146 matching lines @@
       return value;
     }
     default:
       // Everything else not supported.
       return AllocateDartCObjectUnsupported();
   }
 }
 
 
 Dart_CObject* ApiMessageReader::ReadIndexedObject(intptr_t object_id) {
-  if (object_id == kTrueValue) {
-    return AllocateDartCObjectBool(true);
-  }
-  if (object_id == kFalseValue) {
-    return AllocateDartCObjectBool(false);
-  }
   if (object_id == kDynamicType ||
       object_id == kDoubleType ||
       object_id == kIntType ||
       object_id == kBoolType ||
       object_id == kStringType) {
     // Always return dynamic type (this is only a marker).
     return &dynamic_type_marker;
   }
   intptr_t index = object_id - kMaxPredefinedObjectIds;
   ASSERT((0 <= index) && (index < backward_references_.length()));
@@ skipping 19 matching lines @@
   if ((value & kSmiTagMask) == 0) {
     int64_t untagged_value = value >> kSmiTagShift;
     if (kMinInt32 <= untagged_value && untagged_value <= kMaxInt32) {
       return AllocateDartCObjectInt32(untagged_value);
     } else {
       return AllocateDartCObjectInt64(untagged_value);
     }
   }
   ASSERT((value <= kIntptrMax) && (value >= kIntptrMin));
   if (IsVMIsolateObject(value)) {
-    intptr_t object_id = GetVMIsolateObjectId(value);
-    if (object_id == kNullObject) {
-      return AllocateDartCObjectNull();
-    }
-    return ReadVMSymbol(object_id);
+    return ReadVMIsolateObject(value);
   }
   if (SerializedHeaderTag::decode(value) == kObjectId) {
     return ReadIndexedObject(SerializedHeaderData::decode(value));
   }
   ASSERT(SerializedHeaderTag::decode(value) == kInlined);
   return ReadInlinedObject(SerializedHeaderData::decode(value));
 }
 
 
 void ApiMessageReader::AddBackRef(intptr_t id,
@@ skipping 231 matching lines @@
 
 
 bool ApiMessageWriter::WriteCObjectInlined(Dart_CObject* object,
                                            Dart_CObject::Type type) {
   switch (type) {
     case Dart_CObject::kNull:
       WriteNullObject();
       break;
     case Dart_CObject::kBool:
       if (object->value.as_bool) {
-        WriteIndexedObject(kTrueValue);
+        WriteVMIsolateObject(kTrueValue);
       } else {
-        WriteIndexedObject(kFalseValue);
+        WriteVMIsolateObject(kFalseValue);
       }
       break;
     case Dart_CObject::kInt32:
       WriteInt32(object);
       break;
     case Dart_CObject::kInt64:
       WriteInt64(object);
       break;
     case Dart_CObject::kBigint: {
       // Write out the serialization header value for this object.
@@ skipping 121 matching lines @@
     if (!success) {
       UnmarkAllCObjects(object);
       return false;
     }
   }
   UnmarkAllCObjects(object);
   return true;
 }
 
 }  // namespace dart