Index: src/ia32/lithium-ia32.cc |
diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc |
index c73d073406c8bda37658f5cf10e6230960a00d9b..4714c7d1af7673825acb040991f1975b62864742 100644 |
--- a/src/ia32/lithium-ia32.cc |
+++ b/src/ia32/lithium-ia32.cc |
@@ -682,12 +682,16 @@ LInstruction* LChunkBuilder::MarkAsCall(LInstruction* instr, |
instr = AssignPointerMap(instr); |
if (hinstr->HasObservableSideEffects()) { |
- ASSERT(hinstr->next()->IsSimulate()); |
- HSimulate* sim = HSimulate::cast(hinstr->next()); |
ASSERT(instruction_pending_deoptimization_environment_ == NULL); |
ASSERT(pending_deoptimization_ast_id_.IsNone()); |
+ if (!hinstr->IsControlInstruction()) { |
+ ASSERT(hinstr->next()->IsSimulate()); |
+ HSimulate* sim = HSimulate::cast(hinstr->next()); |
+ pending_deoptimization_ast_id_ = sim->ast_id(); |
+ } else { |
+ pending_deoptimization_ast_id_ = BailoutId::PendingMarker(); |
+ } |
instruction_pending_deoptimization_environment_ = instr; |
- pending_deoptimization_ast_id_ = sim->ast_id(); |
} |
// If instruction does not have side-effects lazy deoptimization |
@@ -1700,14 +1704,15 @@ LInstruction* LChunkBuilder::DoRandom(HRandom* instr) { |
} |
-LInstruction* LChunkBuilder::DoCompareGeneric(HCompareGeneric* instr) { |
+LInstruction* LChunkBuilder::DoCompareGenericAndBranch( |
+ HCompareGenericAndBranch* instr) { |
ASSERT(instr->left()->representation().IsSmiOrTagged()); |
ASSERT(instr->right()->representation().IsSmiOrTagged()); |
LOperand* context = UseFixed(instr->context(), esi); |
LOperand* left = UseFixed(instr->left(), edx); |
LOperand* right = UseFixed(instr->right(), eax); |
- LCmpT* result = new(zone()) LCmpT(context, left, right); |
- return MarkAsCall(DefineFixed(result, eax), instr); |
+ return MarkAsCall(new(zone()) LCompareGenericAndBranch(context, left, right), |
+ instr); |
} |
@@ -2626,7 +2631,8 @@ LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) { |
// If there is an instruction pending deoptimization environment create a |
// lazy bailout instruction to capture the environment. |
if (!pending_deoptimization_ast_id_.IsNone()) { |
- ASSERT(pending_deoptimization_ast_id_ == instr->ast_id()); |
+ ASSERT(pending_deoptimization_ast_id_ == instr->ast_id() || |
+ pending_deoptimization_ast_id_.IsPendingMarker()); |
LLazyBailout* lazy_bailout = new(zone()) LLazyBailout; |
LInstruction* result = AssignEnvironment(lazy_bailout); |
// Store the lazy deopt environment with the instruction if needed. Right |