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

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

Issue 2649143002: [Turbofan] Implement call with spread bytecode in assembly code. (Closed)
Patch Set: Rename PushArgsMode to InterpreterPushArgsMode 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 a21e978965ef0dcb8e1786d4004c213e39d656fb..919feec8533dfbdb6d6239948e575304c6a92ad1 100644
--- a/src/interpreter/bytecode-generator.cc
+++ b/src/interpreter/bytecode-generator.cc
@@ -2449,19 +2449,8 @@ void BytecodeGenerator::VisitCall(Call* expr) {
// 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 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();
- }
+ Register callee = register_allocator()->NewRegister();
+ RegisterList 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
@@ -2535,11 +2524,7 @@ void BytecodeGenerator::VisitCall(Call* expr) {
// Evaluate all arguments to the function call and store in sequential args
// registers.
VisitArguments(expr->arguments(), &args);
- // 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());
- }
+ CHECK_EQ(expr->arguments()->length() + 1, args.register_count());
// Resolve callee for a potential direct eval call. This block will mutate the
// callee value.
@@ -2572,9 +2557,8 @@ void BytecodeGenerator::VisitCall(Call* expr) {
// 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);
+ builder()->CallWithSpread(callee, args);
} else {
int const feedback_slot_index = feedback_index(expr->CallFeedbackICSlot());
builder()->Call(callee, args, feedback_slot_index, call_type,
« 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