Chromium Code Reviews| Index: runtime/vm/object.cc |
| =================================================================== |
| --- runtime/vm/object.cc (revision 15727) |
| +++ runtime/vm/object.cc (working copy) |
| @@ -8712,18 +8712,14 @@ |
| RawClass* Type::type_class() const { |
| ASSERT(HasResolvedTypeClass()); |
| - Class& type_class = Class::Handle(); |
| - type_class ^= raw_ptr()->type_class_; |
| - return type_class.raw(); |
| + return reinterpret_cast<RawClass*>(raw_ptr()->type_class_); |
|
Ivan Posva
2012/12/07 17:17:31
I do not like the approach taken here. It should b
Florian Schneider
2012/12/10 16:11:27
What protection do you want here? The caller has t
Ivan Posva
2012/12/10 17:13:42
Please note that since you are returning a RawClas
|
| } |
| RawUnresolvedClass* Type::unresolved_class() const { |
| - ASSERT(!HasResolvedTypeClass()); |
| - UnresolvedClass& unresolved_class = UnresolvedClass::Handle(); |
| - unresolved_class ^= raw_ptr()->type_class_; |
| - ASSERT(!unresolved_class.IsNull()); |
| - return unresolved_class.raw(); |
| + ASSERT(!Object::Handle(raw_ptr()->type_class_).IsNull()); |
| + ASSERT(Object::Handle(raw_ptr()->type_class_).IsUnresolvedClass()); |
| + return reinterpret_cast<RawUnresolvedClass*>(raw_ptr()->type_class_); |
|
Ivan Posva
2012/12/07 17:17:31
ditto + the check for HasResolvedTypeClass() has d
Florian Schneider
2012/12/10 16:11:27
Sure, I can re-insert the assert, but it is redund
Ivan Posva
2012/12/10 17:13:42
Type::HasResolvedType() conveys a completely diffe
|
| } |