Index: src/arm/lithium-codegen-arm.cc |
=================================================================== |
--- src/arm/lithium-codegen-arm.cc (revision 11356) |
+++ src/arm/lithium-codegen-arm.cc (working copy) |
@@ -2267,8 +2267,7 @@ |
RelocInfo::CODE_TARGET, |
instr, |
RECORD_SAFEPOINT_WITH_REGISTERS_AND_NO_ARGUMENTS); |
- ASSERT(instr->HasDeoptimizationEnvironment()); |
- LEnvironment* env = instr->deoptimization_environment(); |
+ LEnvironment* env = instr->GetDeferredLazyDeoptimizationEnvironment(); |
safepoints_.RecordLazyDeoptimizationIndex(env->deoptimization_index()); |
// Put the result value into the result register slot and |
// restore all registers. |
@@ -2886,7 +2885,7 @@ |
__ b(ne, &loop); |
__ bind(&invoke); |
- ASSERT(instr->HasPointerMap() && instr->HasDeoptimizationEnvironment()); |
+ ASSERT(instr->HasPointerMap()); |
LPointerMap* pointers = instr->pointer_map(); |
RecordPosition(pointers->position()); |
SafepointGenerator safepoint_generator( |
@@ -3433,7 +3432,6 @@ |
void LCodeGen::DoInvokeFunction(LInvokeFunction* instr) { |
ASSERT(ToRegister(instr->function()).is(r1)); |
ASSERT(instr->HasPointerMap()); |
- ASSERT(instr->HasDeoptimizationEnvironment()); |
LPointerMap* pointers = instr->pointer_map(); |
RecordPosition(pointers->position()); |
SafepointGenerator generator(this, pointers, Safepoint::kLazyDeopt); |
@@ -4981,7 +4979,7 @@ |
Register strict = scratch0(); |
__ mov(strict, Operand(Smi::FromInt(strict_mode_flag()))); |
__ Push(object, key, strict); |
- ASSERT(instr->HasPointerMap() && instr->HasDeoptimizationEnvironment()); |
+ ASSERT(instr->HasPointerMap()); |
LPointerMap* pointers = instr->pointer_map(); |
RecordPosition(pointers->position()); |
SafepointGenerator safepoint_generator( |
@@ -4994,7 +4992,7 @@ |
Register obj = ToRegister(instr->object()); |
Register key = ToRegister(instr->key()); |
__ Push(key, obj); |
- ASSERT(instr->HasPointerMap() && instr->HasDeoptimizationEnvironment()); |
+ ASSERT(instr->HasPointerMap()); |
LPointerMap* pointers = instr->pointer_map(); |
RecordPosition(pointers->position()); |
SafepointGenerator safepoint_generator(this, pointers, Safepoint::kLazyDeopt); |