| Index: src/compiler/ia32/code-generator-ia32.cc
|
| diff --git a/src/compiler/ia32/code-generator-ia32.cc b/src/compiler/ia32/code-generator-ia32.cc
|
| index 81cf8997047d89c49a7dfbcd707a39468167714a..d7098ae8dc7d3d5aa686622044747f018ed35bfe 100644
|
| --- a/src/compiler/ia32/code-generator-ia32.cc
|
| +++ b/src/compiler/ia32/code-generator-ia32.cc
|
| @@ -455,9 +455,8 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| Register value = i.InputRegister(2);
|
| __ mov(Operand(object, index, times_1, 0), value);
|
| __ lea(index, Operand(object, index, times_1, 0));
|
| - SaveFPRegsMode mode = code_->frame()->DidAllocateDoubleRegisters()
|
| - ? kSaveFPRegs
|
| - : kDontSaveFPRegs;
|
| + SaveFPRegsMode mode =
|
| + frame()->DidAllocateDoubleRegisters() ? kSaveFPRegs : kDontSaveFPRegs;
|
| __ RecordWrite(object, index, value, mode);
|
| break;
|
| }
|
| @@ -777,7 +776,7 @@ void CodeGenerator::AssembleDeoptimizerCall(int deoptimization_id) {
|
|
|
| void CodeGenerator::AssemblePrologue() {
|
| CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
|
| - Frame* frame = code_->frame();
|
| + Frame* frame = this->frame();
|
| int stack_slots = frame->GetSpillSlotCount();
|
| if (descriptor->kind() == CallDescriptor::kCallAddress) {
|
| // Assemble a prologue similar the to cdecl calling convention.
|
| @@ -794,7 +793,7 @@ void CodeGenerator::AssemblePrologue() {
|
| frame->SetRegisterSaveAreaSize(register_save_area_size);
|
| }
|
| } else if (descriptor->IsJSFunctionCall()) {
|
| - CompilationInfo* info = linkage()->info();
|
| + CompilationInfo* info = this->info();
|
| __ Prologue(info->IsCodePreAgingActive());
|
| frame->SetRegisterSaveAreaSize(
|
| StandardFrameConstants::kFixedFrameSizeFromFp);
|
| @@ -1024,7 +1023,7 @@ void CodeGenerator::AddNopForSmiCodeInlining() { __ nop(); }
|
|
|
| void CodeGenerator::EnsureSpaceForLazyDeopt() {
|
| int space_needed = Deoptimizer::patch_size();
|
| - if (!linkage()->info()->IsStub()) {
|
| + if (!info()->IsStub()) {
|
| // Ensure that we have enough space after the previous lazy-bailout
|
| // instruction for patching the code here.
|
| int current_pc = masm()->pc_offset();
|
|
|