Keep track of type parameter processing in mixin application classes.

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 885 matching lines @@
     return PatchBit::decode(raw_ptr()->state_bits_);
   }
   void set_is_patch() const;
 
   bool is_synthesized_class() const {
     return SynthesizedClassBit::decode(raw_ptr()->state_bits_);
   }
   void set_is_synthesized_class() const;
 
   bool is_finalized() const {
-    return StateBits::decode(raw_ptr()->state_bits_) == RawClass::kFinalized;
+    return ClassFinalizedBits::decode(raw_ptr()->state_bits_)
+        == RawClass::kFinalized;
   }
   void set_is_finalized() const;
 
   bool is_prefinalized() const {
-    return StateBits::decode(raw_ptr()->state_bits_) == RawClass::kPreFinalized;
+    return ClassFinalizedBits::decode(raw_ptr()->state_bits_)
+        == RawClass::kPreFinalized;
   }
 
   void set_is_prefinalized() const;
 
   bool is_marked_for_parsing() const {
     return MarkedForParsingBit::decode(raw_ptr()->state_bits_);
   }
   void set_is_marked_for_parsing() const;
   void reset_is_marked_for_parsing() const;
 
   bool is_const() const { return ConstBit::decode(raw_ptr()->state_bits_); }
   void set_is_const() const;
 
   bool is_mixin_typedef() const {
     return MixinTypedefBit::decode(raw_ptr()->state_bits_);
   }
   void set_is_mixin_typedef() const;
 
+  bool is_mixin_type_applied() const {
+    return MixinTypeAppliedBit::decode(raw_ptr()->state_bits_);
+  }
+  void set_is_mixin_type_applied() const;
+
   int num_native_fields() const {
     return raw_ptr()->num_native_fields_;
   }
   void set_num_native_fields(int value) const {
     raw_ptr()->num_native_fields_ = value;
   }
   static intptr_t num_native_fields_offset() {
     return OFFSET_OF(RawClass, num_native_fields_);
   }
 
@@ skipping 72 matching lines @@
     kConstructor,
     kFactory,
   };
   enum {
     kConstBit = 0,
     kImplementedBit = 1,
     kAbstractBit = 2,
     kPatchBit = 3,
     kSynthesizedClassBit = 4,
     kTypeFinalizedBit = 5,
-    kStateTagBit = 6,
-    kStateTagSize = 2,
+    kClassFinalizedBit = 6,

[siva, 2013/09/04 21:07:00]

I think this should be kClassFinalizedBits as we have 2

[regis, 2013/09/04 22:14:27]

Done.

+    kClassFinalizedSize = 2,
     kMarkedForParsingBit = 8,
     kMixinTypedefBit = 9,
+    kMixinTypeAppliedBit = 10,
   };
   class ConstBit : public BitField<bool, kConstBit, 1> {};
   class ImplementedBit : public BitField<bool, kImplementedBit, 1> {};
   class AbstractBit : public BitField<bool, kAbstractBit, 1> {};
   class PatchBit : public BitField<bool, kPatchBit, 1> {};
   class SynthesizedClassBit : public BitField<bool, kSynthesizedClassBit, 1> {};
   class TypeFinalizedBit : public BitField<bool, kTypeFinalizedBit, 1> {};
-  class StateBits : public BitField<RawClass::ClassState,
-                                    kStateTagBit, kStateTagSize> {};  // NOLINT
+  class ClassFinalizedBits : public BitField<RawClass::ClassFinalizedState,
+      kClassFinalizedBit, kClassFinalizedSize> {};  // NOLINT
   class MarkedForParsingBit : public BitField<bool, kMarkedForParsingBit, 1> {};
   class MixinTypedefBit : public BitField<bool, kMixinTypedefBit, 1> {};
+  class MixinTypeAppliedBit : public BitField<bool, kMixinTypeAppliedBit, 1> {};
 
   void set_name(const String& value) const;
   void set_signature_function(const Function& value) const;
   void set_signature_type(const AbstractType& value) const;
-  void set_class_state(RawClass::ClassState state) const;
   void set_state_bits(intptr_t bits) const;
 
   void set_constants(const Array& value) const;
 
   void set_canonical_types(const Array& value) const;
   RawArray* canonical_types() const;
 
   RawArray* invocation_dispatcher_cache() const;
   void set_invocation_dispatcher_cache(const Array& cache) const;
   RawFunction* CreateInvocationDispatcher(const String& target_name,
@@ skipping 5100 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_