Chromium Code Reviews| Index: runtime/vm/raw_object.h |
| diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h |
| index 977ba55040acdc93904c958016db44714e6dce62..538e24c620a15dc58bd22d2013ba2be76861c815 100644 |
| --- a/runtime/vm/raw_object.h |
| +++ b/runtime/vm/raw_object.h |
| @@ -625,6 +625,7 @@ CLASS_LIST_TYPED_DATA(DEFINE_IS_CID) |
| friend class Closure; |
| friend class Code; |
| friend class Double; |
| + friend class ForwardPointersVisitor; // StorePointer |
| friend class FreeListElement; |
| friend class Function; |
| friend class GCMarker; |
| @@ -735,6 +736,7 @@ class RawClass : public RawObject { |
| uint16_t state_bits_; |
| friend class Instance; |
| + friend class Isolate; |
| friend class Object; |
| friend class RawInstance; |
| friend class RawInstructions; |
| @@ -1038,6 +1040,7 @@ class RawScript : public RawObject { |
| int32_t line_offset_; |
| int32_t col_offset_; |
| int8_t kind_; // Of type Kind. |
| + int64_t load_timestamp_; |
| }; |
| @@ -1683,9 +1686,10 @@ class RawType : public RawAbstractType { |
| RAW_HEAP_OBJECT_IMPLEMENTATION(Type); |
| RawObject** from() { |
| - return reinterpret_cast<RawObject**>(&ptr()->type_class_); |
| + return reinterpret_cast<RawObject**>(&ptr()->type_class_id_); |
| } |
| - RawObject* type_class_; // Either resolved class or unresolved class. |
| + // Either the id of the resolved class as a Smi or an UnresolvedClass. |
| + RawObject* type_class_id_; |
| RawTypeArguments* arguments_; |
| // This type object represents a function type if its signature field is a |
| // non-null function object. |
| @@ -1724,9 +1728,10 @@ class RawTypeParameter : public RawAbstractType { |
| RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter); |
| RawObject** from() { |
| - return reinterpret_cast<RawObject**>(&ptr()->parameterized_class_); |
| + return reinterpret_cast<RawObject**>(&ptr()->parameterized_class_id_); |
| } |
| - RawClass* parameterized_class_; |
| + // The parameterized class id is stored as a RawSmi*. |
| + RawObject* parameterized_class_id_; |
|
rmacnak
2016/05/11 19:56:18
Why not RawSmi* ?
Cutch
2016/05/12 16:08:49
Doner.
|
| RawString* name_; |
| RawAbstractType* bound_; // ObjectType if no explicit bound specified. |
| RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->bound_); } |