Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index ccda5268417c9e040e646735c4cbee729d759740..762e15cee1eb59c45a7d3110ef491c5fb687f852 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -2139,8 +2139,7 @@ void LCodeGen::DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr, |
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. |
@@ -2772,7 +2771,7 @@ void LCodeGen::DoApplyArguments(LApplyArguments* instr) { |
__ sll(scratch, length, 2); |
__ bind(&invoke); |
- ASSERT(instr->HasPointerMap() && instr->HasDeoptimizationEnvironment()); |
+ ASSERT(instr->HasPointerMap()); |
LPointerMap* pointers = instr->pointer_map(); |
RecordPosition(pointers->position()); |
SafepointGenerator safepoint_generator( |
@@ -3336,7 +3335,6 @@ void LCodeGen::DoUnaryMathOperation(LUnaryMathOperation* instr) { |
void LCodeGen::DoInvokeFunction(LInvokeFunction* instr) { |
ASSERT(ToRegister(instr->function()).is(a1)); |
ASSERT(instr->HasPointerMap()); |
- ASSERT(instr->HasDeoptimizationEnvironment()); |
if (instr->known_function().is_null()) { |
LPointerMap* pointers = instr->pointer_map(); |
@@ -4955,7 +4953,7 @@ void LCodeGen::DoDeleteProperty(LDeleteProperty* instr) { |
Register strict = scratch0(); |
__ li(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( |
@@ -4968,7 +4966,7 @@ void LCodeGen::DoIn(LIn* instr) { |
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); |