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

Unified Diff: src/ic.cc

Issue 201313002: Fix ASSERT violation when BinaryOpIC::Transition recurses into itself (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: refactored Created 6 years, 9 months 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 | « src/ic.h ('k') | test/mjsunit/regress/regress-crbug-352586.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 f1e3c5539d64fbd9f74cc0de671edc62a2cb3db6..335e687c0b50070c0889cf3bae0de83884962121 100644
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -2404,8 +2404,11 @@ MaybeObject* BinaryOpIC::Transition(Handle<AllocationSite> allocation_site,
isolate(), function, left, 1, &right, &caught_exception);
if (caught_exception) return Failure::Exception();
+ // Execution::Call can execute arbitrary JavaScript, hence potentially
+ // update the state of this very IC, so we must update the stored state.
+ UpdateTarget();
// Compute the new state.
- State old_state = state;
+ State old_state(target()->extra_ic_state());
state.Update(left, right, result);
// Check if we have a string operation here.
« no previous file with comments | « src/ic.h ('k') | test/mjsunit/regress/regress-crbug-352586.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698