| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index de9123d5c4ce0d2d1688b8f40d862f3c586540da..207dd8cdaa40550343a1d7a7a31fc6ff5bbc5bc7 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -509,36 +509,17 @@ Operand LCodeGen::ToOperand(LOperand* op) {
|
| }
|
|
|
|
|
| -static int ArgumentsOffsetWithoutFrame(int index) {
|
| - ASSERT(index < 0);
|
| - return -(index + 1) * kPointerSize;
|
| -}
|
| -
|
| -
|
| MemOperand LCodeGen::ToMemOperand(LOperand* op) const {
|
| ASSERT(!op->IsRegister());
|
| ASSERT(!op->IsDoubleRegister());
|
| ASSERT(op->IsStackSlot() || op->IsDoubleStackSlot());
|
| - if (NeedsEagerFrame()) {
|
| - return MemOperand(fp, StackSlotOffset(op->index()));
|
| - } else {
|
| - // Retrieve parameter without eager stack-frame relative to the
|
| - // stack-pointer.
|
| - return MemOperand(sp, ArgumentsOffsetWithoutFrame(op->index()));
|
| - }
|
| + return MemOperand(fp, StackSlotOffset(op->index()));
|
| }
|
|
|
|
|
| MemOperand LCodeGen::ToHighMemOperand(LOperand* op) const {
|
| ASSERT(op->IsDoubleStackSlot());
|
| - if (NeedsEagerFrame()) {
|
| - return MemOperand(fp, StackSlotOffset(op->index()) + kPointerSize);
|
| - } else {
|
| - // Retrieve parameter without eager stack-frame relative to the
|
| - // stack-pointer.
|
| - return MemOperand(
|
| - sp, ArgumentsOffsetWithoutFrame(op->index()) + kPointerSize);
|
| - }
|
| + return MemOperand(fp, StackSlotOffset(op->index()) + kPointerSize);
|
| }
|
|
|
|
|
| @@ -4126,12 +4107,7 @@ void LCodeGen::DoCallFunction(LCallFunction* instr) {
|
|
|
| int arity = instr->arity();
|
| CallFunctionStub stub(arity, NO_CALL_FUNCTION_FLAGS);
|
| - if (instr->hydrogen()->IsTailCall()) {
|
| - if (NeedsEagerFrame()) __ mov(sp, fp);
|
| - __ Jump(stub.GetCode(isolate()), RelocInfo::CODE_TARGET);
|
| - } else {
|
| - CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| - }
|
| + CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
|
|
|
|