Chromium Code Reviews| Index: src/ic.cc |
| diff --git a/src/ic.cc b/src/ic.cc |
| index 2607bb3b68d53405be03865fe60538dea4e8b9e0..88c3842e2a344479ea8b9f1e2e455b3746b9871a 100644 |
| --- a/src/ic.cc |
| +++ b/src/ic.cc |
| @@ -1205,7 +1205,7 @@ MaybeObject* StoreIC::Store(Handle<Object> object, |
| } |
| // Observed objects are always modified through the runtime. |
| - if (FLAG_harmony_observation && receiver->map()->is_observed()) { |
| + if (receiver->map()->is_observed()) { |
| Handle<Object> result = JSReceiver::SetProperty( |
| receiver, name, value, NONE, strict_mode(), store_mode); |
| RETURN_IF_EMPTY_HANDLE(isolate(), result); |
| @@ -1671,7 +1671,7 @@ MaybeObject* KeyedStoreIC::Store(Handle<Object> object, |
| if (maybe_object->IsFailure()) return maybe_object; |
| } else { |
| bool use_ic = FLAG_use_ic && !object->IsAccessCheckNeeded() && |
| - !(FLAG_harmony_observation && object->IsJSObject() && |
| + !(object->IsJSObject() && |
| JSObject::cast(*object)->map()->is_observed()); |
|
rossberg
2014/03/06 08:41:35
Nit: does it fit previous line?
|
| if (use_ic && !object->IsSmi()) { |
| // Don't use ICs for maps of the objects in Array's prototype chain. We |