Index: src/crankshaft/x64/lithium-codegen-x64.cc |
diff --git a/src/crankshaft/x64/lithium-codegen-x64.cc b/src/crankshaft/x64/lithium-codegen-x64.cc |
index e4470d81beb9b45b0ced0482ab59d504b2279189..e64f928b95d0887d002d656a382d498e3c4f1085 100644 |
--- a/src/crankshaft/x64/lithium-codegen-x64.cc |
+++ b/src/crankshaft/x64/lithium-codegen-x64.cc |
@@ -406,7 +406,7 @@ bool LCodeGen::GenerateDeferredCode() { |
bool LCodeGen::GenerateSafepointTable() { |
DCHECK(is_done()); |
- safepoints_.Emit(masm(), GetStackSlotCount()); |
+ safepoints_.Emit(masm(), GetTotalFrameSlotCount()); |
return !is_aborted(); |
} |
@@ -507,7 +507,7 @@ Operand LCodeGen::ToOperand(LOperand* op) const { |
// representable as an Operand. |
DCHECK(op->IsStackSlot() || op->IsDoubleStackSlot()); |
if (NeedsEagerFrame()) { |
- return Operand(rbp, StackSlotOffset(op->index())); |
+ return Operand(rbp, FrameSlotToFPOffset(op->index())); |
} else { |
// Retrieve parameter without eager stack-frame relative to the |
// stack-pointer. |
@@ -575,9 +575,6 @@ void LCodeGen::AddToTranslation(LEnvironment* environment, |
if (op->IsStackSlot()) { |
int index = op->index(); |
- if (index >= 0) { |
- index += StandardFrameConstants::kFixedFrameSize / kPointerSize; |
- } |
if (is_tagged) { |
translation->StoreStackSlot(index); |
} else if (is_uint32) { |
@@ -587,9 +584,6 @@ void LCodeGen::AddToTranslation(LEnvironment* environment, |
} |
} else if (op->IsDoubleStackSlot()) { |
int index = op->index(); |
- if (index >= 0) { |
- index += StandardFrameConstants::kFixedFrameSize / kPointerSize; |
- } |
translation->StoreDoubleStackSlot(index); |
} else if (op->IsRegister()) { |
Register reg = ToRegister(op); |