| Index: src/objects-inl.h
|
| diff --git a/src/objects-inl.h b/src/objects-inl.h
|
| index 8a73561468663d5747799af92e044770d1e578fd..818484c0fb92b1b0df1c177745481aed80507dfc 100644
|
| --- a/src/objects-inl.h
|
| +++ b/src/objects-inl.h
|
| @@ -2881,11 +2881,6 @@ Code::Kind Code::kind() {
|
| }
|
|
|
|
|
| -InLoopFlag Code::ic_in_loop() {
|
| - return ExtractICInLoopFromFlags(flags());
|
| -}
|
| -
|
| -
|
| InlineCacheState Code::ic_state() {
|
| InlineCacheState result = ExtractICStateFromFlags(flags());
|
| // Only allow uninitialized or debugger states for non-IC code
|
| @@ -3091,7 +3086,6 @@ bool Code::is_inline_cache_stub() {
|
|
|
|
|
| Code::Flags Code::ComputeFlags(Kind kind,
|
| - InLoopFlag in_loop,
|
| InlineCacheState ic_state,
|
| ExtraICState extra_ic_state,
|
| PropertyType type,
|
| @@ -3100,16 +3094,15 @@ Code::Flags Code::ComputeFlags(Kind kind,
|
| // Extra IC state is only allowed for call IC stubs or for store IC
|
| // stubs.
|
| ASSERT(extra_ic_state == kNoExtraICState ||
|
| - (kind == CALL_IC) ||
|
| - (kind == STORE_IC) ||
|
| - (kind == KEYED_STORE_IC));
|
| + kind == CALL_IC ||
|
| + kind == STORE_IC ||
|
| + kind == KEYED_STORE_IC);
|
| // Compute the bit mask.
|
| int bits = KindField::encode(kind)
|
| - | ICInLoopField::encode(in_loop)
|
| | ICStateField::encode(ic_state)
|
| | TypeField::encode(type)
|
| | ExtraICStateField::encode(extra_ic_state)
|
| - | (argc << kFlagsArgumentsCountShift)
|
| + | (argc << kArgumentsCountShift)
|
| | CacheHolderField::encode(holder);
|
| return static_cast<Flags>(bits);
|
| }
|
| @@ -3119,10 +3112,8 @@ Code::Flags Code::ComputeMonomorphicFlags(Kind kind,
|
| PropertyType type,
|
| ExtraICState extra_ic_state,
|
| InlineCacheHolderFlag holder,
|
| - InLoopFlag in_loop,
|
| int argc) {
|
| - return ComputeFlags(
|
| - kind, in_loop, MONOMORPHIC, extra_ic_state, type, argc, holder);
|
| + return ComputeFlags(kind, MONOMORPHIC, extra_ic_state, type, argc, holder);
|
| }
|
|
|
|
|
| @@ -3141,18 +3132,13 @@ Code::ExtraICState Code::ExtractExtraICStateFromFlags(Flags flags) {
|
| }
|
|
|
|
|
| -InLoopFlag Code::ExtractICInLoopFromFlags(Flags flags) {
|
| - return ICInLoopField::decode(flags);
|
| -}
|
| -
|
| -
|
| PropertyType Code::ExtractTypeFromFlags(Flags flags) {
|
| return TypeField::decode(flags);
|
| }
|
|
|
|
|
| int Code::ExtractArgumentsCountFromFlags(Flags flags) {
|
| - return (flags & kFlagsArgumentsCountMask) >> kFlagsArgumentsCountShift;
|
| + return (flags & kArgumentsCountMask) >> kArgumentsCountShift;
|
| }
|
|
|
|
|
|
|