Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Unified Diff: src/ic.cc

Issue 11358122: Object.observe: Fixed missing case for turning off ICs. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/mjsunit/harmony/object-observe.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ic.cc
diff --git a/src/ic.cc b/src/ic.cc
index 50a3a277a3bfa21746e172a14f9a00b9054a9320..e75e253d8e8270bf4d79be5b90e81855dc18abbf 100644
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -1921,7 +1921,9 @@ MaybeObject* KeyedStoreIC::Store(State state,
// Do not use ICs for objects that require access checks (including
rafaelw 2012/11/07 09:10:10 Maybe update comment?
Michael Starzinger 2012/11/07 11:08:29 +1
rossberg 2012/11/07 12:23:49 Done.
// the global object).
- bool use_ic = FLAG_use_ic && !object->IsAccessCheckNeeded();
+ bool use_ic = FLAG_use_ic && !object->IsAccessCheckNeeded() &&
+ !(FLAG_harmony_observation && object->IsJSObject() &&
+ JSObject::cast(*object)->map()->is_observed());
ASSERT(!(use_ic && object->IsJSGlobalProxy()));
if (use_ic) {
« no previous file with comments | « no previous file | test/mjsunit/harmony/object-observe.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698