AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

X87: [es6] Spread in array literals

Browse Source 
port 9502e91adb (r28534)

original commit message:

    This allows you to put iterables into your array literals
    and the will get spread into the array.

      let x = [0, ...range(1, 3)];  // [0, 1, 2]

    This is done by treating the array literal up to the first
    spread element as usual, including using a boiler plate
    array, and then appending the remaining expressions and rest
    expressions.

BUG=

Review URL: https://codereview.chromium.org/1152173002

Cr-Commit-Position: refs/heads/master@{#28606}
This commit is contained in:
chunyang.dai 2015-05-25 06:15:22 -07:00 committed by Commit bot
parent 47448c9b19
commit 83321b09ed
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/x87/full-codegen-x87.cc
View File

@ -1808,8 +1808,11 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
// Emit code to evaluate all the non-constant subexpressions and to store // Emit code to evaluate all the non-constant subexpressions and to store
// them into the newly cloned array. // them into the newly cloned array.
for (int i = 0; i < length; i++) { int array_index = 0;
Expression* subexpr = subexprs->at(i); for (; array_index < length; array_index++) {
Expression* subexpr = subexprs->at(array_index);
if (subexpr->IsSpread()) break;
// If the subexpression is a literal or a simple materialized literal it // If the subexpression is a literal or a simple materialized literal it
// is already set in the cloned array. // is already set in the cloned array.
if (CompileTimeValue::IsCompileTimeValue(subexpr)) continue; if (CompileTimeValue::IsCompileTimeValue(subexpr)) continue;
@ -1824,7 +1827,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
if (has_constant_fast_elements) { if (has_constant_fast_elements) {
// Fast-case array literal with ElementsKind of FAST_*_ELEMENTS, they // Fast-case array literal with ElementsKind of FAST_*_ELEMENTS, they
// cannot transition and don't need to call the runtime stub. // cannot transition and don't need to call the runtime stub.
int offset = FixedArray::kHeaderSize + (i * kPointerSize); int offset = FixedArray::kHeaderSize + (array_index * kPointerSize);
__ mov(ebx, Operand(esp, kPointerSize)); // Copy of array literal. __ mov(ebx, Operand(esp, kPointerSize)); // Copy of array literal.
__ mov(ebx, FieldOperand(ebx, JSObject::kElementsOffset)); __ mov(ebx, FieldOperand(ebx, JSObject::kElementsOffset));
// Store the subexpression value in the array's elements. // Store the subexpression value in the array's elements.
@ -1834,16 +1837,41 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
EMIT_REMEMBERED_SET, INLINE_SMI_CHECK); EMIT_REMEMBERED_SET, INLINE_SMI_CHECK);
} else { } else {
// Store the subexpression value in the array's elements. // Store the subexpression value in the array's elements.
__ mov(ecx, Immediate(Smi::FromInt(i))); __ mov(ecx, Immediate(Smi::FromInt(array_index)));
StoreArrayLiteralElementStub stub(isolate()); StoreArrayLiteralElementStub stub(isolate());
__ CallStub(&stub); __ CallStub(&stub);
} }
PrepareForBailoutForId(expr->GetIdForElement(i), NO_REGISTERS); PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS);
}
// In case the array literal contains spread expressions it has two parts. The
// first part is the "static" array which has a literal index is handled
// above. The second part is the part after the first spread expression
// (inclusive) and these elements gets appended to the array. Note that the
// number elements an iterable produces is unknown ahead of time.
if (array_index < length && result_saved) {
__ Drop(1); // literal index
__ Pop(eax);
result_saved = false;
}
for (; array_index < length; array_index++) {
Expression* subexpr = subexprs->at(array_index);
__ Push(eax);
if (subexpr->IsSpread()) {
VisitForStackValue(subexpr->AsSpread()->expression());
__ InvokeBuiltin(Builtins::CONCAT_ITERABLE_TO_ARRAY, CALL_FUNCTION);
} else {
VisitForStackValue(subexpr);
__ CallRuntime(Runtime::kAppendElement, 2);
}
PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS);
} }
if (result_saved) { if (result_saved) {
__ add(esp, Immediate(kPointerSize)); // literal index __ Drop(1); // literal index
context()->PlugTOS(); context()->PlugTOS();
} else { } else {
context()->Plug(eax); context()->Plug(eax);