Index: src/type-info.cc |
diff --git a/src/type-info.cc b/src/type-info.cc |
index 6ac05547aac55a6091c33d531c4f07c26b2d5e72..f31edb7ed76a00f28fa49986abaf0b9c37eed11c 100644 |
--- a/src/type-info.cc |
+++ b/src/type-info.cc |
@@ -126,9 +126,9 @@ 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 = |
- Code::GetKeyedAccessStoreMode(code->extra_ic_state()) == |
- STANDARD_STORE; |
+ 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 && |
@@ -146,9 +146,9 @@ bool TypeFeedbackOracle::StoreIsPolymorphic(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 = |
- Code::GetKeyedAccessStoreMode(code->extra_ic_state()) == |
- STANDARD_STORE; |
+ bool standard_store = FLAG_compiled_keyed_stores || |
+ (Code::GetKeyedAccessStoreMode(code->extra_ic_state()) == |
+ STANDARD_STORE); |
return code->is_keyed_store_stub() && standard_store && |
code->ic_state() == POLYMORPHIC; |
} |