Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index e5d190ade934156e0e62fbde8150e853ed5956e4..4afcadbd2d7479990d5594b0c52c641aa1e20128 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -337,7 +337,7 @@ void FullCodeGenerator::EmitBackEdgeBookkeeping(IterationStatement* stmt, |
ASSERT(back_edge_target->is_bound()); |
int distance = masm_->SizeOfCodeGeneratedSince(back_edge_target); |
weight = Min(kMaxBackEdgeWeight, |
- Max(1, distance / kCodeSizeMultiplier)); |
+ Max(1, distance / kBackEdgeDistanceUnit)); |
} |
EmitProfilingCounterDecrement(weight); |
__ j(positive, &ok, Label::kNear); |
@@ -378,7 +378,7 @@ void FullCodeGenerator::EmitReturnSequence() { |
} else if (FLAG_weighted_back_edges) { |
int distance = masm_->pc_offset(); |
weight = Min(kMaxBackEdgeWeight, |
- Max(1, distance / kCodeSizeMultiplier)); |
+ Max(1, distance / kBackEdgeDistanceUnit)); |
} |
EmitProfilingCounterDecrement(weight); |
Label ok; |
@@ -1812,8 +1812,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
} |
if (!result_saved) { |
- __ push(rax); // array literal |
- __ Push(Smi::FromInt(expr->literal_index())); |
+ __ push(rax); |
result_saved = true; |
} |
VisitForAccumulatorValue(subexpr); |
@@ -1822,7 +1821,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
// Fast-case array literal with ElementsKind of FAST_*_ELEMENTS, they |
// cannot transition and don't need to call the runtime stub. |
int offset = FixedArray::kHeaderSize + (i * kPointerSize); |
- __ movq(rbx, Operand(rsp, kPointerSize)); // Copy of array literal. |
+ __ movq(rbx, Operand(rsp, 0)); // Copy of array literal. |
__ movq(rbx, FieldOperand(rbx, JSObject::kElementsOffset)); |
// Store the subexpression value in the array's elements. |
__ movq(FieldOperand(rbx, offset), result_register()); |
@@ -1833,7 +1832,10 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
INLINE_SMI_CHECK); |
} else { |
// Store the subexpression value in the array's elements. |
+ __ movq(rbx, Operand(rsp, 0)); // Copy of array literal. |
+ __ movq(rdi, FieldOperand(rbx, JSObject::kMapOffset)); |
__ Move(rcx, Smi::FromInt(i)); |
+ __ Move(rdx, Smi::FromInt(expr->literal_index())); |
StoreArrayLiteralElementStub stub; |
__ CallStub(&stub); |
} |
@@ -1842,7 +1844,6 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
} |
if (result_saved) { |
- __ addq(rsp, Immediate(kPointerSize)); // literal index |
context()->PlugTOS(); |
} else { |
context()->Plug(rax); |