Support mixin application typedef as mixin in the VM (issues 9383, 12773).

runtime/vm/object.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 1710 matching lines @@
           !signature_fun.HasInstantiatedSignature()) {
         cls = signature_fun.Owner();
       }
     }
     // Calling NumTypeParameters() on a mixin application class will setup the
     // type parameters if not already done.
     if (cls.NumTypeParameters() > 0) {
       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()) {
       break;
     }
     sup_type ^= cls.super_type();
     cls = sup_type.type_class();
   } while (true);
   return num_type_args;
 }
 
 
 bool Class::HasTypeArguments() const {
   if (!IsSignatureClass() && (is_finalized() || is_prefinalized())) {
     // More efficient than calling NumTypeArguments().
     return type_arguments_field_offset() != kNoTypeArguments;
   } else {
     // No need to check NumTypeArguments() if class has type parameters.
     return (NumTypeParameters() > 0) || (NumTypeArguments() > 0);
   }
 }
 
 
 RawClass* Class::SuperClass() const {
   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();
 }
 
 
 void Class::set_super_type(const AbstractType& value) const {
   ASSERT(value.IsNull() ||
          value.IsType() ||
          value.IsBoundedType() ||
          value.IsMixinAppType());
   StorePointer(&raw_ptr()->super_type_, value.raw());
@@ skipping 10101 matching lines @@
   JSONObject jsobj(stream);
 }
 
 
 RawAbstractType* MixinAppType::SuperType() const {
   return Class::Handle(MixinAppAt(0)).super_type();
 }
 
 
 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));
 }
 
 
 void MixinAppType::set_mixins(const Array& value) const {
   StorePointer(&raw_ptr()->mixins_, value.raw());
 }
 
 
 RawMixinAppType* MixinAppType::New() {
   ASSERT(Isolate::Current()->object_store()->mixin_app_type_class() !=
@@ skipping 3225 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 }  // namespace dart