Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1213)

Unified Diff: runtime/vm/object.cc

Issue 11500004: Address comments about safely casting handles. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc (revision 17701)
+++ runtime/vm/object.cc (working copy)
@@ -9316,14 +9316,28 @@
RawClass* Type::type_class() const {
ASSERT(HasResolvedTypeClass());
+#ifdef DEBUG
+ Class& type_class = Class::Handle();
+ type_class ^= raw_ptr()->type_class_;
+ return type_class.raw();
+#else
return reinterpret_cast<RawClass*>(raw_ptr()->type_class_);
+#endif
}
RawUnresolvedClass* Type::unresolved_class() const {
+ ASSERT(!HasResolvedTypeClass());
+#ifdef DEBUG
+ UnresolvedClass& unresolved_class = UnresolvedClass::Handle();
+ unresolved_class ^= raw_ptr()->type_class_;
+ ASSERT(!unresolved_class.IsNull());
+ return unresolved_class.raw();
+#else
ASSERT(!Object::Handle(raw_ptr()->type_class_).IsNull());
ASSERT(Object::Handle(raw_ptr()->type_class_).IsUnresolvedClass());
return reinterpret_cast<RawUnresolvedClass*>(raw_ptr()->type_class_);
+#endif
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698