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

vm/snapshot_test.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 "include/dart_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_message.h"
@@ skipping 21 matching lines @@
       Double& dbl1 = Double::Handle();
       Double& dbl2 = Double::Handle();
       dbl1 ^= expected.raw();
       dbl2 ^= actual.raw();
       return dbl1.value() == dbl2.value();
     }
     return false;
   }
   if (expected.IsBool()) {
     if (actual.IsBool()) {
-      Bool& bl1 = Bool::Handle();
-      Bool& bl2 = Bool::Handle();
-      bl1 ^= expected.raw();
-      bl2 ^= actual.raw();
-      return bl1.value() == bl2.value();
+      return expected.raw() == actual.raw();
     }
     return false;
   }
   return false;
 }
 
 
 static uint8_t* malloc_allocator(
     uint8_t* ptr, intptr_t old_size, intptr_t new_size) {
   return reinterpret_cast<uint8_t*>(realloc(ptr, new_size));
@@ skipping 248 matching lines @@
   CheckEncodeDecodeMessage(root);
 }
 
 
 TEST_CASE(SerializeTrue) {
   StackZone zone(Isolate::Current());
 
   // Write snapshot with true object.
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator);
-  const Bool& bl = Bool::Handle(Bool::True());
+  const Bool& bl = Bool::True();
   writer.WriteMessage(bl);
   intptr_t buffer_len = writer.BytesWritten();
 
   // Read object back from the snapshot.
   SnapshotReader reader(buffer, buffer_len,
                         Snapshot::kMessage, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   fprintf(stderr, "%s / %s\n", bl.ToCString(), serialized_object.ToCString());
 
   EXPECT(Equals(bl, serialized_object));
 
   // Read object back from the snapshot into a C structure.
   ApiNativeScope scope;
   ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);
   Dart_CObject* root = api_reader.ReadMessage();
   EXPECT_NOTNULL(root);
   EXPECT_EQ(Dart_CObject::kBool, root->type);
   EXPECT_EQ(true, root->value.as_bool);
   CheckEncodeDecodeMessage(root);
 }
 
 
 TEST_CASE(SerializeFalse) {
   StackZone zone(Isolate::Current());
 
   // Write snapshot with false object.
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator);
-  const Bool& bl = Bool::Handle(Bool::False());
+  const Bool& bl = Bool::False();
   writer.WriteMessage(bl);
   intptr_t buffer_len = writer.BytesWritten();
 
   // Read object back from the snapshot.
   SnapshotReader reader(buffer, buffer_len,
                         Snapshot::kMessage, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(bl, serialized_object));
 
   // Read object back from the snapshot into a C structure.
@@ skipping 898 matching lines @@
   const Object& list = Object::Handle(Api::UnwrapHandle(result));
   writer.WriteMessage(list);
   intptr_t buffer_len = writer.BytesWritten();
 
   // Read object back from the snapshot into a C structure.
   ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);
   return api_reader.ReadMessage();
 }
 
 
-static void CheckString(Dart_Handle string, const char* expected) {
+static void CheckString(Dart_Handle dart_string, const char* expected) {
   StackZone zone(Isolate::Current());
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator);
   String& str = String::Handle();
-  str ^= Api::UnwrapHandle(string);
+  str ^= Api::UnwrapHandle(dart_string);
   writer.WriteMessage(str);
   intptr_t buffer_len = writer.BytesWritten();
 
   // Read object back from the snapshot into a C structure.
   ApiNativeScope scope;
   ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);
   Dart_CObject* root = api_reader.ReadMessage();
   EXPECT_NOTNULL(root);
   EXPECT_EQ(Dart_CObject::kString, root->type);
   EXPECT_STREQ(expected, root->value.as_string);
   CheckEncodeDecodeMessage(root);
 }
 
 
-static void CheckStringInvalid(Dart_Handle string) {
+static void CheckStringInvalid(Dart_Handle dart_string) {
   StackZone zone(Isolate::Current());
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator);
   String& str = String::Handle();
-  str ^= Api::UnwrapHandle(string);
+  str ^= Api::UnwrapHandle(dart_string);
   writer.WriteMessage(str);
   intptr_t buffer_len = writer.BytesWritten();
 
   // Read object back from the snapshot into a C structure.
   ApiNativeScope scope;
   ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);
   Dart_CObject* root = api_reader.ReadMessage();
   EXPECT_NOTNULL(root);
   EXPECT_EQ(Dart_CObject::kUnsupported, root->type);
 }
@@ skipping 901 matching lines @@
   EXPECT(Dart_ErrorHasException(result));
   EXPECT_SUBSTRING("Exception: nulltruefalse123456æøå3.14[]100123456789\n",
                    Dart_GetError(result));
 
   Dart_ExitScope();
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart