Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index de52fadda939f9e5c93be34d664355dab12ec445..e6b1c8f533bd4fdb4d5442c21cd04a9dce34570f 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -781,17 +781,36 @@ bool LCodeGen::IsSmi(LConstantOperand* op) const { |
} |
+static int ArgumentsOffsetWithoutFrame(int index) { |
+ ASSERT(index < 0); |
+ return -(index + 1) * kPointerSize + kPCOnStackSize; |
+} |
+ |
+ |
Operand LCodeGen::ToOperand(LOperand* op) const { |
if (op->IsRegister()) return Operand(ToRegister(op)); |
if (op->IsDoubleRegister()) return Operand(ToDoubleRegister(op)); |
ASSERT(op->IsStackSlot() || op->IsDoubleStackSlot()); |
- return Operand(ebp, StackSlotOffset(op->index())); |
+ if (NeedsEagerFrame()) { |
+ return Operand(ebp, StackSlotOffset(op->index())); |
+ } else { |
+ // Retrieve parameter without eager stack-frame relative to the |
+ // stack-pointer. |
+ return Operand(esp, ArgumentsOffsetWithoutFrame(op->index())); |
+ } |
} |
Operand LCodeGen::HighOperand(LOperand* op) { |
ASSERT(op->IsDoubleStackSlot()); |
- return Operand(ebp, StackSlotOffset(op->index()) + kPointerSize); |
+ if (NeedsEagerFrame()) { |
+ return Operand(ebp, StackSlotOffset(op->index()) + kPointerSize); |
+ } else { |
+ // Retrieve parameter without eager stack-frame relative to the |
+ // stack-pointer. |
+ return Operand( |
+ esp, ArgumentsOffsetWithoutFrame(op->index()) + kPointerSize); |
+ } |
} |
@@ -4376,7 +4395,12 @@ void LCodeGen::DoCallFunction(LCallFunction* instr) { |
int arity = instr->arity(); |
CallFunctionStub stub(arity, NO_CALL_FUNCTION_FLAGS); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ if (instr->hydrogen()->IsTailCall()) { |
+ if (NeedsEagerFrame()) __ leave(); |
+ __ jmp(stub.GetCode(isolate()), RelocInfo::CODE_TARGET); |
+ } else { |
+ CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ } |
} |