| Index: src/ia32/lithium-codegen-ia32.cc
|
| ===================================================================
|
| --- src/ia32/lithium-codegen-ia32.cc (revision 11356)
|
| +++ src/ia32/lithium-codegen-ia32.cc (working copy)
|
| @@ -2059,8 +2059,9 @@
|
| RelocInfo::CODE_TARGET,
|
| instr,
|
| RECORD_SAFEPOINT_WITH_REGISTERS_AND_NO_ARGUMENTS);
|
| - ASSERT(instr->HasDeoptimizationEnvironment());
|
| - LEnvironment* env = instr->deoptimization_environment();
|
| + // Get the deoptimization index of the LLazyBailout-environment that
|
| + // corresponds to this instruction.
|
| + LEnvironment* env = instr->GetDeferredLazyDeoptimizationEnvironment();
|
| safepoints_.RecordLazyDeoptimizationIndex(env->deoptimization_index());
|
|
|
| // Put the result value into the eax slot and restore all registers.
|
| @@ -2670,7 +2671,7 @@
|
|
|
| // Invoke the function.
|
| __ bind(&invoke);
|
| - ASSERT(instr->HasPointerMap() && instr->HasDeoptimizationEnvironment());
|
| + ASSERT(instr->HasPointerMap());
|
| LPointerMap* pointers = instr->pointer_map();
|
| RecordPosition(pointers->position());
|
| SafepointGenerator safepoint_generator(
|
| @@ -3235,7 +3236,6 @@
|
| ASSERT(ToRegister(instr->context()).is(esi));
|
| ASSERT(ToRegister(instr->function()).is(edi));
|
| ASSERT(instr->HasPointerMap());
|
| - ASSERT(instr->HasDeoptimizationEnvironment());
|
| LPointerMap* pointers = instr->pointer_map();
|
| RecordPosition(pointers->position());
|
| SafepointGenerator generator(
|
| @@ -4825,7 +4825,7 @@
|
| LOperand* key = instr->key();
|
| __ push(ToOperand(obj));
|
| EmitPushTaggedOperand(key);
|
| - ASSERT(instr->HasPointerMap() && instr->HasDeoptimizationEnvironment());
|
| + ASSERT(instr->HasPointerMap());
|
| LPointerMap* pointers = instr->pointer_map();
|
| RecordPosition(pointers->position());
|
| // Create safepoint generator that will also ensure enough space in the
|
| @@ -4923,7 +4923,7 @@
|
| LOperand* key = instr->key();
|
| EmitPushTaggedOperand(key);
|
| EmitPushTaggedOperand(obj);
|
| - ASSERT(instr->HasPointerMap() && instr->HasDeoptimizationEnvironment());
|
| + ASSERT(instr->HasPointerMap());
|
| LPointerMap* pointers = instr->pointer_map();
|
| RecordPosition(pointers->position());
|
| SafepointGenerator safepoint_generator(
|
|
|