| Index: runtime/vm/object.cc
|
| diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
|
| index 0cfa413eda298e48f3058400b91f3111308433f1..920b9bde762ef9685f71b2af30647a8f54195da1 100644
|
| --- a/runtime/vm/object.cc
|
| +++ b/runtime/vm/object.cc
|
| @@ -545,6 +545,7 @@ void Object::InitOnce(Isolate* isolate) {
|
| cls.set_state_bits(0);
|
| cls.set_is_finalized();
|
| cls.set_is_type_finalized();
|
| + cls.set_is_cycle_free();
|
| cls.set_type_arguments_field_offset_in_words(Class::kNoTypeArguments);
|
| cls.set_num_type_arguments(0);
|
| cls.set_num_own_type_arguments(0);
|
| @@ -565,6 +566,7 @@ void Object::InitOnce(Isolate* isolate) {
|
| cls.set_num_own_type_arguments(0);
|
| cls.set_is_finalized();
|
| cls.set_is_type_finalized();
|
| + cls.set_is_cycle_free();
|
|
|
| // Allocate and initialize the forwarding corpse class.
|
| cls = Class::New<ForwardingCorpse::FakeInstance>(kForwardingCorpse);
|
| @@ -572,6 +574,7 @@ void Object::InitOnce(Isolate* isolate) {
|
| cls.set_num_own_type_arguments(0);
|
| cls.set_is_finalized();
|
| cls.set_is_type_finalized();
|
| + cls.set_is_cycle_free();
|
|
|
| // Allocate and initialize the sentinel values of Null class.
|
| {
|
| @@ -824,20 +827,23 @@ void Object::InitOnce(Isolate* isolate) {
|
| cls.set_is_abstract();
|
| cls.set_num_type_arguments(0);
|
| cls.set_num_own_type_arguments(0);
|
| - cls.set_is_type_finalized();
|
| cls.set_is_finalized();
|
| + cls.set_is_type_finalized();
|
| + cls.set_is_cycle_free();
|
| dynamic_class_ = cls.raw();
|
|
|
| cls = Class::New<Instance>(kVoidCid);
|
| cls.set_num_type_arguments(0);
|
| cls.set_num_own_type_arguments(0);
|
| - cls.set_is_type_finalized();
|
| cls.set_is_finalized();
|
| + cls.set_is_type_finalized();
|
| + cls.set_is_cycle_free();
|
| void_class_ = cls.raw();
|
|
|
| cls = Class::New<Type>();
|
| - cls.set_is_type_finalized();
|
| cls.set_is_finalized();
|
| + cls.set_is_type_finalized();
|
| + cls.set_is_cycle_free();
|
|
|
| cls = dynamic_class_;
|
| *dynamic_type_ = Type::NewNonParameterizedType(cls);
|
| @@ -3187,6 +3193,7 @@ RawClass* Class::NewNativeWrapper(const Library& library,
|
| cls.set_is_finalized();
|
| cls.set_is_type_finalized();
|
| cls.set_is_synthesized_class();
|
| + cls.set_is_cycle_free();
|
| library.AddClass(cls);
|
| return cls.raw();
|
| } else {
|
|
|