Chromium Code Reviews| Index: runtime/vm/object.h |
| =================================================================== |
| --- runtime/vm/object.h (revision 6865) |
| +++ runtime/vm/object.h (working copy) |
| @@ -885,9 +885,12 @@ |
| return OFFSET_OF(RawType, type_class_); |
| } |
| virtual bool IsFinalized() const { |
| - return raw_ptr()->type_state_ == RawType::kFinalized; |
| + return |
| + (raw_ptr()->type_state_ == RawType::kFinalizedInstantiated) || |
| + (raw_ptr()->type_state_ == RawType::kFinalizedUninstantiated); |
| } |
| - void set_is_finalized() const; |
| + void set_is_finalized_instantiated() const; |
| + void set_is_finalized_uninstantiated() const; |
| virtual bool IsBeingFinalized() const { |
| return raw_ptr()->type_state_ == RawType::kBeingFinalized; |
| } |
| @@ -976,7 +979,7 @@ |
| class TypeParameter : public AbstractType { |
| public: |
| virtual bool IsFinalized() const { |
| - return raw_ptr()->type_state_ == RawTypeParameter::kFinalized; |
| + return raw_ptr()->type_state_ == RawTypeParameter::kFinalizedUninstantiated; |
|
srdjan
2012/04/24 00:56:28
Assert somewhere that is is not kFinalizedInstanti
regis
2012/04/24 16:06:58
Done.
|
| } |
| void set_is_finalized() const; |
| virtual bool IsBeingFinalized() const { return false; } |