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

Unified Diff: runtime/vm/object.cc

Issue 24397002: Support mixin application typedef as mixin in the VM (issues 9383, 12773). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 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 | « runtime/vm/class_finalizer.cc ('k') | runtime/vm/parser.h » ('j') | 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 27790)
+++ runtime/vm/object.cc (working copy)
@@ -1728,7 +1728,6 @@
type_params ^= cls.type_parameters();
num_type_args += type_params.Length();
}
-
// Super type of Object class is null.
if (cls.super_type() == AbstractType::null() ||
cls.super_type() == isolate->object_store()->object_type()) {
@@ -1756,10 +1755,7 @@
if (super_type() == AbstractType::null()) {
return Class::null();
}
- Isolate* isolate = Isolate::Current();
- ReusableHandleScope reused_handles(isolate);
- AbstractType& sup_type = reused_handles.AbstractTypeHandle();
- sup_type ^= super_type();
+ const AbstractType& sup_type = AbstractType::Handle(super_type());
return sup_type.type_class();
}
@@ -11881,9 +11877,7 @@
RawClass* MixinAppType::MixinAppAt(intptr_t depth) const {
- Class& mixin_app = Class::Handle();
- mixin_app ^= Array::Handle(mixins()).At(depth);
- return mixin_app.raw();
+ return Class::RawCast(Array::Handle(mixins()).At(depth));
}
« no previous file with comments | « runtime/vm/class_finalizer.cc ('k') | runtime/vm/parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698