Eliminate interface bool

runtime/vm/object.cc

Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc	(revision 11414)
+++ runtime/vm/object.cc	(working copy)
@@ -560,7 +560,7 @@
   cls = Class::New<Bool>();
   object_store->set_bool_class(cls);
   name = Symbols::Bool();
-  RegisterClass(cls, name, core_impl_lib);
+  RegisterClass(cls, name, core_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = object_store->array_class();  // Was allocated above.
@@ -788,11 +788,6 @@
   type = Type::NewNonParameterizedType(cls);
   object_store->set_string_interface(type);
 
-  cls = CreateAndRegisterInterface("bool", script, core_lib);
-  pending_classes.Add(cls, Heap::kOld);
-  type = Type::NewNonParameterizedType(cls);
-  object_store->set_bool_interface(type);
-
   cls = CreateAndRegisterInterface("List", script, core_lib);
   pending_classes.Add(cls, Heap::kOld);
   type = Type::NewNonParameterizedType(cls);
@@ -803,6 +798,10 @@
   type = Type::NewNonParameterizedType(cls);
   object_store->set_byte_array_interface(type);
 
+  cls = object_store->bool_class();
+  type = Type::NewNonParameterizedType(cls);
+  object_store->set_bool_type(type);
+
   cls = object_store->smi_class();
   type = Type::NewNonParameterizedType(cls);
   object_store->set_smi_type(type);
@@ -1166,8 +1165,6 @@
     case kExternalTwoByteStringCid:
     case kExternalFourByteStringCid:
       return Symbols::New("String");
-    case kBoolCid:
-      return Symbols::New("bool");
     case kArrayCid:
     case kImmutableArrayCid:
     case kGrowableObjectArrayCid:
@@ -2556,9 +2553,9 @@
 }
 
 
-bool AbstractType::IsBoolInterface() const {
+bool AbstractType::IsBoolType() const {
   return HasResolvedTypeClass() &&
-      (type_class() == Type::Handle(Type::BoolInterface()).type_class());
+      (type_class() == Type::Handle(Type::BoolType()).type_class());
 }
 
 
@@ -2689,8 +2686,8 @@
 }
 
 
-RawType* Type::BoolInterface() {
-  return Isolate::Current()->object_store()->bool_interface();
+RawType* Type::BoolType() {
+  return Isolate::Current()->object_store()->bool_type();
 }