| Index: runtime/vm/object.h
|
| ===================================================================
|
| --- runtime/vm/object.h (revision 28697)
|
| +++ runtime/vm/object.h (working copy)
|
| @@ -1033,24 +1033,24 @@
|
| enum {
|
| kConstBit = 0,
|
| kImplementedBit = 1,
|
| - kAbstractBit = 2,
|
| - kPatchBit = 3,
|
| - kSynthesizedClassBit = 4,
|
| - kTypeFinalizedBit = 5,
|
| - kClassFinalizedBits = 6,
|
| + kTypeFinalizedBit = 2,
|
| + kClassFinalizedBits = 3,
|
| kClassFinalizedSize = 2,
|
| + kAbstractBit = 5,
|
| + kPatchBit = 6,
|
| + kSynthesizedClassBit = 7,
|
| kMarkedForParsingBit = 8,
|
| kMixinTypedefBit = 9,
|
| kMixinTypeAppliedBit = 10,
|
| };
|
| class ConstBit : public BitField<bool, kConstBit, 1> {};
|
| class ImplementedBit : public BitField<bool, kImplementedBit, 1> {};
|
| + class TypeFinalizedBit : public BitField<bool, kTypeFinalizedBit, 1> {};
|
| + class ClassFinalizedBits : public BitField<RawClass::ClassFinalizedState,
|
| + kClassFinalizedBits, kClassFinalizedSize> {}; // NOLINT
|
| 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 ClassFinalizedBits : public BitField<RawClass::ClassFinalizedState,
|
| - kClassFinalizedBits, kClassFinalizedSize> {}; // NOLINT
|
| class MarkedForParsingBit : public BitField<bool, kMarkedForParsingBit, 1> {};
|
| class MixinTypedefBit : public BitField<bool, kMixinTypedefBit, 1> {};
|
| class MixinTypeAppliedBit : public BitField<bool, kMixinTypeAppliedBit, 1> {};
|
| @@ -1865,35 +1865,35 @@
|
|
|
| private:
|
| enum KindTagBits {
|
| - kStaticBit = 0,
|
| - kConstBit = 1,
|
| - kOptimizableBit = 2,
|
| - kInlinableBit = 3,
|
| - kHasFinallyBit = 4,
|
| - kNativeBit = 5,
|
| + kKindTagBit = 0,
|
| + kKindTagSize = 4,
|
| + kStaticBit = 4,
|
| + kConstBit = 5,
|
| kAbstractBit = 6,
|
| - kExternalBit = 7,
|
| - kVisibleBit = 8,
|
| - kIntrinsicBit = 9,
|
| - kRecognizedBit = 10,
|
| - kRedirectingBit = 11,
|
| - kKindTagBit = 12,
|
| - kKindTagSize = 4,
|
| + kVisibleBit = 7,
|
| + kOptimizableBit = 8,
|
| + kInlinableBit = 9,
|
| + kIntrinsicBit = 10,
|
| + kRecognizedBit = 11,
|
| + kHasFinallyBit = 12,
|
| + kNativeBit = 13,
|
| + kRedirectingBit = 14,
|
| + kExternalBit = 15,
|
| };
|
| + class KindBits :
|
| + public BitField<RawFunction::Kind, kKindTagBit, kKindTagSize> {}; // NOLINT
|
| class StaticBit : public BitField<bool, kStaticBit, 1> {};
|
| class ConstBit : public BitField<bool, kConstBit, 1> {};
|
| + class AbstractBit : public BitField<bool, kAbstractBit, 1> {};
|
| + class VisibleBit : public BitField<bool, kVisibleBit, 1> {};
|
| class OptimizableBit : public BitField<bool, kOptimizableBit, 1> {};
|
| class InlinableBit : public BitField<bool, kInlinableBit, 1> {};
|
| + class IntrinsicBit : public BitField<bool, kIntrinsicBit, 1> {};
|
| + class RecognizedBit : public BitField<bool, kRecognizedBit, 1> {};
|
| class HasFinallyBit : public BitField<bool, kHasFinallyBit, 1> {};
|
| class NativeBit : public BitField<bool, kNativeBit, 1> {};
|
| - class AbstractBit : public BitField<bool, kAbstractBit, 1> {};
|
| class ExternalBit : public BitField<bool, kExternalBit, 1> {};
|
| - class VisibleBit : public BitField<bool, kVisibleBit, 1> {};
|
| - class IntrinsicBit : public BitField<bool, kIntrinsicBit, 1> {};
|
| - class RecognizedBit : public BitField<bool, kRecognizedBit, 1> {};
|
| class RedirectingBit : public BitField<bool, kRedirectingBit, 1> {};
|
| - class KindBits :
|
| - public BitField<RawFunction::Kind, kKindTagBit, kKindTagSize> {}; // NOLINT
|
|
|
| void set_name(const String& value) const;
|
| void set_kind(RawFunction::Kind value) const;
|
|
|