Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1668)

Unified Diff: src/interpreter/bytecode-generator.cc

Issue 2629363002: [Ignition/turbo] Add a CallWithSpread bytecode. (Closed)
Patch Set: reparent on the bytecode CL Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/interpreter/bytecode-array-builder.cc ('k') | src/interpreter/bytecodes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/interpreter/bytecode-generator.cc
diff --git a/src/interpreter/bytecode-generator.cc b/src/interpreter/bytecode-generator.cc
index 6d4f1ae75d3bd5109368e15c367bea027ab79608..a21e978965ef0dcb8e1786d4004c213e39d656fb 100644
--- a/src/interpreter/bytecode-generator.cc
+++ b/src/interpreter/bytecode-generator.cc
@@ -2445,12 +2445,27 @@ void BytecodeGenerator::VisitCall(Call* expr) {
return VisitCallSuper(expr);
}
- Register callee = register_allocator()->NewRegister();
// Grow the args list as we visit receiver / arguments to avoid allocating all
// the registers up-front. Otherwise these registers are unavailable during
// receiver / argument visiting and we can end up with memory leaks due to
// registers keeping objects alive.
- RegisterList args = register_allocator()->NewGrowableRegisterList();
+ RegisterList args;
+ Register callee;
+ // The CallWithSpread bytecode takes all arguments in a register list so that
+ // it can easily call into a runtime function for its implementation. This
+ // will change once CallWithSpread has an implementation in ASM.
+ // TODO(petermarshall): Remove this special path when CallWithSpread is done.
+ if (expr->only_last_arg_is_spread()) {
+ args = register_allocator()->NewGrowableRegisterList();
+ callee = register_allocator()->GrowRegisterList(&args);
+ } else {
+ callee = register_allocator()->NewRegister();
+ args = register_allocator()->NewGrowableRegisterList();
+ }
+
+ // TODO(petermarshall): We have a lot of call bytecodes that are very similar,
+ // see if we can reduce the number by adding a separate argument which
+ // specifies the call type (e.g., property, spread, tailcall, etc.).
// Prepare the callee and the receiver to the function call. This depends on
// the semantics of the underlying call type.
@@ -2459,7 +2474,7 @@ void BytecodeGenerator::VisitCall(Call* expr) {
case Call::KEYED_PROPERTY_CALL: {
Property* property = callee_expr->AsProperty();
VisitAndPushIntoRegisterList(property->obj(), &args);
- VisitPropertyLoadForRegister(args[0], property, callee);
+ VisitPropertyLoadForRegister(args.last_register(), property, callee);
break;
}
case Call::GLOBAL_CALL: {
@@ -2520,7 +2535,11 @@ void BytecodeGenerator::VisitCall(Call* expr) {
// Evaluate all arguments to the function call and store in sequential args
// registers.
VisitArguments(expr->arguments(), &args);
- CHECK_EQ(expr->arguments()->length() + 1, args.register_count());
+ // TODO(petermarshall): Check this for spread calls as well when
+ // CallWithSpread is done.
+ if (!expr->only_last_arg_is_spread()) {
+ CHECK_EQ(expr->arguments()->length() + 1, args.register_count());
+ }
// Resolve callee for a potential direct eval call. This block will mutate the
// callee value.
@@ -2550,9 +2569,17 @@ void BytecodeGenerator::VisitCall(Call* expr) {
builder()->SetExpressionPosition(expr);
- int const feedback_slot_index = feedback_index(expr->CallFeedbackICSlot());
- builder()->Call(callee, args, feedback_slot_index, call_type,
- expr->tail_call_mode());
+ // When a call contains a spread, a Call AST node is only created if there is
+ // exactly one spread, and it is the last argument.
+ if (expr->only_last_arg_is_spread()) {
+ CHECK_EQ(expr->arguments()->length() + 2, args.register_count());
+ DCHECK_EQ(TailCallMode::kDisallow, expr->tail_call_mode());
+ builder()->CallWithSpread(args);
+ } else {
+ int const feedback_slot_index = feedback_index(expr->CallFeedbackICSlot());
+ builder()->Call(callee, args, feedback_slot_index, call_type,
+ expr->tail_call_mode());
+ }
}
void BytecodeGenerator::VisitCallSuper(Call* expr) {
@@ -2574,7 +2601,7 @@ void BytecodeGenerator::VisitCallSuper(Call* expr) {
// When a super call contains a spread, a CallSuper AST node is only created
// if there is exactly one spread, and it is the last argument.
- if (!args->is_empty() && args->last()->IsSpread()) {
+ if (expr->only_last_arg_is_spread()) {
// TODO(petermarshall): Collect type on the feedback slot.
builder()->NewWithSpread(constructor, args_regs);
} else {
@@ -2595,12 +2622,18 @@ void BytecodeGenerator::VisitCallNew(CallNew* expr) {
RegisterList args = register_allocator()->NewGrowableRegisterList();
VisitArguments(expr->arguments(), &args);
- builder()->SetExpressionPosition(expr);
// The accumulator holds new target which is the same as the
// constructor for CallNew.
- builder()
- ->LoadAccumulatorWithRegister(constructor)
- .New(constructor, args, feedback_index(expr->CallNewFeedbackSlot()));
+ builder()->SetExpressionPosition(expr);
+ builder()->LoadAccumulatorWithRegister(constructor);
+
+ if (expr->only_last_arg_is_spread()) {
+ // TODO(petermarshall): Collect type on the feedback slot.
+ builder()->NewWithSpread(constructor, args);
+ } else {
+ builder()->New(constructor, args,
+ feedback_index(expr->CallNewFeedbackSlot()));
+ }
}
void BytecodeGenerator::VisitCallRuntime(CallRuntime* expr) {
« no previous file with comments | « src/interpreter/bytecode-array-builder.cc ('k') | src/interpreter/bytecodes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698