| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index 9dc077168be0dbbdcca1cefe2f376921ff011a5d..8cf9b584179637e5639aa4c45383a947260c01e0 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -3653,7 +3653,6 @@ class Code: public HeapObject {
|
| inline Kind kind();
|
| inline InlineCacheState ic_state(); // Only valid for IC stubs.
|
| inline ExtraICState extra_ic_state(); // Only valid for IC stubs.
|
| - inline InLoopFlag ic_in_loop(); // Only valid for IC stubs.
|
| inline PropertyType type(); // Only valid for monomorphic IC stubs.
|
| inline int arguments_count(); // Only valid for call IC stubs.
|
|
|
| @@ -3741,7 +3740,6 @@ class Code: public HeapObject {
|
| // Flags operations.
|
| static inline Flags ComputeFlags(
|
| Kind kind,
|
| - InLoopFlag in_loop = NOT_IN_LOOP,
|
| InlineCacheState ic_state = UNINITIALIZED,
|
| ExtraICState extra_ic_state = kNoExtraICState,
|
| PropertyType type = NORMAL,
|
| @@ -3753,11 +3751,9 @@ class Code: public HeapObject {
|
| PropertyType type,
|
| ExtraICState extra_ic_state = kNoExtraICState,
|
| InlineCacheHolderFlag holder = OWN_MAP,
|
| - InLoopFlag in_loop = NOT_IN_LOOP,
|
| int argc = -1);
|
|
|
| static inline InlineCacheState ExtractICStateFromFlags(Flags flags);
|
| - static inline InLoopFlag ExtractICInLoopFromFlags(Flags flags);
|
| static inline PropertyType ExtractTypeFromFlags(Flags flags);
|
| static inline Kind ExtractKindFromFlags(Flags flags);
|
| static inline InlineCacheHolderFlag ExtractCacheHolderFromFlags(Flags flags);
|
| @@ -3885,18 +3881,17 @@ class Code: public HeapObject {
|
|
|
| // Flags layout. BitField<type, shift, size>.
|
| class ICStateField: public BitField<InlineCacheState, 0, 3> {};
|
| - class ICInLoopField: public BitField<InLoopFlag, 3, 1> {};
|
| - class TypeField: public BitField<PropertyType, 4, 4> {};
|
| - class KindField: public BitField<Kind, 8, 4> {};
|
| - class CacheHolderField: public BitField<InlineCacheHolderFlag, 12, 1> {};
|
| - class ExtraICStateField: public BitField<ExtraICState, 13, 2> {};
|
| + class TypeField: public BitField<PropertyType, 3, 4> {};
|
| + class KindField: public BitField<Kind, 7, 4> {};
|
| + class CacheHolderField: public BitField<InlineCacheHolderFlag, 11, 1> {};
|
| + class ExtraICStateField: public BitField<ExtraICState, 12, 2> {};
|
|
|
| // Signed field cannot be encoded using the BitField class.
|
| - static const int kFlagsArgumentsCountShift = 15;
|
| - static const int kFlagsArgumentsCountMask = 0xffff8000;
|
| + static const int kArgumentsCountShift = 14;
|
| + static const int kArgumentsCountMask = ~((1 << kArgumentsCountShift) - 1);
|
|
|
| static const int kFlagsNotUsedInLookup =
|
| - ICInLoopField::kMask | TypeField::kMask | CacheHolderField::kMask;
|
| + TypeField::kMask | CacheHolderField::kMask;
|
|
|
| private:
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(Code);
|
|
|