| Index: src/x64/lithium-codegen-x64.cc
|
| ===================================================================
|
| --- src/x64/lithium-codegen-x64.cc (revision 11126)
|
| +++ src/x64/lithium-codegen-x64.cc (working copy)
|
| @@ -2497,28 +2497,24 @@
|
| void LCodeGen::DoArgumentsElements(LArgumentsElements* instr) {
|
| Register result = ToRegister(instr->result());
|
|
|
| - if (instr->from_inlined()) {
|
| - __ lea(result, Operand(rsp, -2 * kPointerSize));
|
| - } else {
|
| - // Check for arguments adapter frame.
|
| - Label done, adapted;
|
| - __ movq(result, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
|
| - __ Cmp(Operand(result, StandardFrameConstants::kContextOffset),
|
| - Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
|
| - __ j(equal, &adapted, Label::kNear);
|
| + // Check for arguments adapter frame.
|
| + Label done, adapted;
|
| + __ movq(result, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
|
| + __ Cmp(Operand(result, StandardFrameConstants::kContextOffset),
|
| + Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
|
| + __ j(equal, &adapted, Label::kNear);
|
|
|
| - // No arguments adaptor frame.
|
| - __ movq(result, rbp);
|
| - __ jmp(&done, Label::kNear);
|
| + // No arguments adaptor frame.
|
| + __ movq(result, rbp);
|
| + __ jmp(&done, Label::kNear);
|
|
|
| - // Arguments adaptor frame present.
|
| - __ bind(&adapted);
|
| - __ movq(result, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
|
| + // Arguments adaptor frame present.
|
| + __ bind(&adapted);
|
| + __ movq(result, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
|
|
|
| - // Result is the frame pointer for the frame if not adapted and for the real
|
| - // frame below the adaptor frame if adapted.
|
| - __ bind(&done);
|
| - }
|
| + // Result is the frame pointer for the frame if not adapted and for the real
|
| + // frame below the adaptor frame if adapted.
|
| + __ bind(&done);
|
| }
|
|
|
|
|
| @@ -2644,11 +2640,6 @@
|
| }
|
|
|
|
|
| -void LCodeGen::DoPop(LPop* instr) {
|
| - __ Drop(instr->count());
|
| -}
|
| -
|
| -
|
| void LCodeGen::DoThisFunction(LThisFunction* instr) {
|
| Register result = ToRegister(instr->result());
|
| __ LoadHeapObject(result, instr->hydrogen()->closure());
|
|
|