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

Unified Diff: src/ia32/lithium-codegen-ia32.cc

Issue 6348016: Record the lazy deoptimization environmnent only at LLazyBailout-instructions... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 11 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 | src/ia32/lithium-ia32.h » ('j') | src/ia32/lithium-ia32.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ia32/lithium-codegen-ia32.cc
===================================================================
--- src/ia32/lithium-codegen-ia32.cc (revision 6436)
+++ src/ia32/lithium-codegen-ia32.cc (working copy)
@@ -414,16 +414,20 @@
// Create the environment to bailout to. If the call has side effects
// execution has to continue after the call otherwise execution can continue
// from a previous bailout point repeating the call.
- LEnvironment* deoptimization_environment;
- if (instr->HasDeoptimizationEnvironment()) {
- deoptimization_environment = instr->deoptimization_environment();
+ LEnvironment* lazy_deoptimization_environment;
+ ASSERT(!instr->IsControl());
+ ASSERT(instructions_->at(current_instruction_ + 1)->IsGap());
Søren Thygesen Gjesse 2011/01/24 13:02:43 As far as I remember there used to be places where
+ LInstruction* next_instr = instructions_->at(current_instruction_ + 2);
+ if (next_instr->IsLazyBailout()) {
+ ASSERT(next_instr->HasEnvironment());
+ lazy_deoptimization_environment = next_instr->environment();
} else {
- deoptimization_environment = instr->environment();
+ lazy_deoptimization_environment = instr->environment();
}
- RegisterEnvironmentForDeoptimization(deoptimization_environment);
+ RegisterEnvironmentForDeoptimization(lazy_deoptimization_environment);
RecordSafepoint(instr->pointer_map(),
- deoptimization_environment->deoptimization_index());
+ lazy_deoptimization_environment->deoptimization_index());
}
« no previous file with comments | « no previous file | src/ia32/lithium-ia32.h » ('j') | src/ia32/lithium-ia32.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698