[turbofan] Fix RawMachineAssembler for multiple return values.

src/compiler/raw-machine-assembler.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/raw-machine-assembler.h"
 
 #include "src/code-factory.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/pipeline.h"
 #include "src/compiler/scheduler.h"
@@ skipping 136 matching lines @@
   }
   buffer[index++] = frame_state;
   return AddNode(common()->Call(desc), input_count, buffer);
 }
 
 
 Node* RawMachineAssembler::CallRuntime1(Runtime::FunctionId function,
                                         Node* arg1, Node* context) {
   CallDescriptor* descriptor = Linkage::GetRuntimeCallDescriptor(
       zone(), function, 1, Operator::kNoProperties, CallDescriptor::kNoFlags);
+  int return_count = static_cast<int>(descriptor->ReturnCount());
 
-  Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
+  Node* centry = HeapConstant(CEntryStub(isolate(), return_count).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(1);
 
   return AddNode(common()->Call(descriptor), centry, arg1, ref, arity, context);
 }
 
 
 Node* RawMachineAssembler::CallRuntime2(Runtime::FunctionId function,
                                         Node* arg1, Node* arg2, Node* context) {
   CallDescriptor* descriptor = Linkage::GetRuntimeCallDescriptor(
       zone(), function, 2, Operator::kNoProperties, CallDescriptor::kNoFlags);
+  int return_count = static_cast<int>(descriptor->ReturnCount());
 
-  Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
+  Node* centry = HeapConstant(CEntryStub(isolate(), return_count).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(2);
 
   return AddNode(common()->Call(descriptor), centry, arg1, arg2, ref, arity,
                  context);
 }
 
 
 Node* RawMachineAssembler::CallRuntime4(Runtime::FunctionId function,
                                         Node* arg1, Node* arg2, Node* arg3,
                                         Node* arg4, Node* context) {
   CallDescriptor* descriptor = Linkage::GetRuntimeCallDescriptor(
       zone(), function, 4, Operator::kNoProperties, CallDescriptor::kNoFlags);
+  int return_count = static_cast<int>(descriptor->ReturnCount());
 
-  Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
+  Node* centry = HeapConstant(CEntryStub(isolate(), return_count).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(4);
 
   return AddNode(common()->Call(descriptor), centry, arg1, arg2, arg3, arg4,
                  ref, arity, context);
 }
 
 
 Node* RawMachineAssembler::TailCallN(CallDescriptor* desc, Node* function,
@@ skipping 14 matching lines @@
   return tail_call;
 }
 
 
 Node* RawMachineAssembler::TailCallRuntime1(Runtime::FunctionId function,
                                             Node* arg1, Node* context) {
   const int kArity = 1;
   CallDescriptor* desc = Linkage::GetRuntimeCallDescriptor(
       zone(), function, kArity, Operator::kNoProperties,
       CallDescriptor::kSupportsTailCalls);
+  int return_count = static_cast<int>(desc->ReturnCount());
 
-  Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
+  Node* centry = HeapConstant(CEntryStub(isolate(), return_count).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(kArity);
 
   Node* nodes[] = {centry, arg1, ref, arity, context};
   Node* tail_call = MakeNode(common()->TailCall(desc), arraysize(nodes), nodes);
 
   NodeProperties::MergeControlToEnd(graph(), common(), tail_call);
   schedule()->AddTailCall(CurrentBlock(), tail_call);
   current_block_ = nullptr;
   return tail_call;
 }
 
 
 Node* RawMachineAssembler::TailCallRuntime2(Runtime::FunctionId function,
                                             Node* arg1, Node* arg2,
                                             Node* context) {
   const int kArity = 2;
   CallDescriptor* desc = Linkage::GetRuntimeCallDescriptor(
       zone(), function, kArity, Operator::kNoProperties,
       CallDescriptor::kSupportsTailCalls);
+  int return_count = static_cast<int>(desc->ReturnCount());
 
-  Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
+  Node* centry = HeapConstant(CEntryStub(isolate(), return_count).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(kArity);
 
   Node* nodes[] = {centry, arg1, arg2, ref, arity, context};
   Node* tail_call = MakeNode(common()->TailCall(desc), arraysize(nodes), nodes);
 
   NodeProperties::MergeControlToEnd(graph(), common(), tail_call);
   schedule()->AddTailCall(CurrentBlock(), tail_call);
   current_block_ = nullptr;
@@ skipping 109 matching lines @@
 
 RawMachineLabel::RawMachineLabel()
     : block_(NULL), used_(false), bound_(false) {}
 
 
 RawMachineLabel::~RawMachineLabel() { DCHECK(bound_ || !used_); }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8