Keep track of type parameter processing in mixin application classes.

runtime/vm/object.h

Index: runtime/vm/object.h
===================================================================
--- runtime/vm/object.h	(revision 27140)
+++ runtime/vm/object.h	(working copy)
@@ -903,12 +903,14 @@
   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;
@@ -927,6 +929,11 @@
   }
   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_;
   }
@@ -1019,10 +1026,11 @@
     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> {};
@@ -1030,15 +1038,15 @@
   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;