| Index: runtime/vm/object.cc
|
| ===================================================================
|
| --- runtime/vm/object.cc (revision 11354)
|
| +++ 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.
|
| @@ -787,10 +787,9 @@
|
| type = Type::NewNonParameterizedType(cls);
|
| object_store->set_string_interface(type);
|
|
|
| - cls = CreateAndRegisterInterface("bool", script, core_lib);
|
| - pending_classes.Add(cls, Heap::kOld);
|
| + cls = object_store->bool_class();
|
| type = Type::NewNonParameterizedType(cls);
|
| - object_store->set_bool_interface(type);
|
| + object_store->set_bool_type(type);
|
|
|
| cls = CreateAndRegisterInterface("List", script, core_lib);
|
| pending_classes.Add(cls, Heap::kOld);
|
| @@ -2555,9 +2554,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());
|
| }
|
|
|
|
|
| @@ -2688,8 +2687,8 @@
|
| }
|
|
|
|
|
| -RawType* Type::BoolInterface() {
|
| - return Isolate::Current()->object_store()->bool_interface();
|
| +RawType* Type::BoolType() {
|
| + return Isolate::Current()->object_store()->bool_type();
|
| }
|
|
|
|
|
|
|