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

Unified Diff: src/hydrogen-removable-simulates.cc

Issue 607453002: Disable merging simulates across captured objects. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Tweaks to the comment. Created 6 years, 3 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 | « no previous file | test/mjsunit/regress/regress-416730.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/hydrogen-removable-simulates.cc
diff --git a/src/hydrogen-removable-simulates.cc b/src/hydrogen-removable-simulates.cc
index a28021deb882b1e9896d706187fc1bb797e6bdd4..73d7a8e0583eb9c53946c33b80f54dc98948126f 100644
--- a/src/hydrogen-removable-simulates.cc
+++ b/src/hydrogen-removable-simulates.cc
@@ -53,6 +53,13 @@ class State : public ZoneObject {
FlushSimulates();
return this;
}
+ if (instr->IsCapturedObject()) {
+ // Do not merge simulates across captured objects - captured objects
+ // change environments during environment replay, and such changes
+ // would not be reflected in the simulate.
+ FlushSimulates();
+ return this;
+ }
// Skip the non-simulates and the first simulate.
if (!instr->IsSimulate()) return this;
if (first_) {
« no previous file with comments | « no previous file | test/mjsunit/regress/regress-416730.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698