| Index: src/type-info.cc | 
| diff --git a/src/type-info.cc b/src/type-info.cc | 
| index 336b459d6b7b2aa230c24cb4fdba1efca2569e24..190eb3e6fff90dbaad5d5d479d1da0b148b9c8a7 100644 | 
| --- a/src/type-info.cc | 
| +++ b/src/type-info.cc | 
| @@ -152,12 +152,8 @@ bool TypeFeedbackOracle::StoreIsMonomorphicNormal(TypeFeedbackId ast_id) { | 
| if (map_or_code->IsMap()) return true; | 
| if (map_or_code->IsCode()) { | 
| Handle<Code> code = Handle<Code>::cast(map_or_code); | 
| -    bool standard_store = FLAG_compiled_keyed_stores || | 
| -        (Code::GetKeyedAccessStoreMode(code->extra_ic_state()) == | 
| -         STANDARD_STORE); | 
| bool preliminary_checks = | 
| code->is_keyed_store_stub() && | 
| -        standard_store && | 
| code->ic_state() == MONOMORPHIC && | 
| Code::ExtractTypeFromFlags(code->flags()) == Code::NORMAL; | 
| if (!preliminary_checks) return false; | 
| @@ -174,10 +170,7 @@ bool TypeFeedbackOracle::StoreIsKeyedPolymorphic(TypeFeedbackId ast_id) { | 
| Handle<Object> map_or_code = GetInfo(ast_id); | 
| if (map_or_code->IsCode()) { | 
| Handle<Code> code = Handle<Code>::cast(map_or_code); | 
| -    bool standard_store = FLAG_compiled_keyed_stores || | 
| -        (Code::GetKeyedAccessStoreMode(code->extra_ic_state()) == | 
| -         STANDARD_STORE); | 
| -    return code->is_keyed_store_stub() && standard_store && | 
| +    return code->is_keyed_store_stub() && | 
| code->ic_state() == POLYMORPHIC; | 
| } | 
| return false; | 
|  |