Remove dummy control / effect edges from RMA Call nodes.

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 103 matching lines @@
   Node* ret = MakeNode(common()->Return(3), 3, values);
   schedule()->AddReturn(CurrentBlock(), ret);
   current_block_ = nullptr;
 }
 
 
 Node* RawMachineAssembler::CallN(CallDescriptor* desc, Node* function,
                                  Node** args) {
   int param_count =
       static_cast<int>(desc->GetMachineSignature()->parameter_count());
-  int input_count = param_count + 3;
+  int input_count = param_count + 1;
   Node** buffer = zone()->NewArray<Node*>(input_count);
   int index = 0;
   buffer[index++] = function;
   for (int i = 0; i < param_count; i++) {
     buffer[index++] = args[i];
   }
-  buffer[index++] = graph()->start();
-  buffer[index++] = graph()->start();
   return AddNode(common()->Call(desc), input_count, buffer);
 }
 
 
 Node* RawMachineAssembler::CallNWithFrameState(CallDescriptor* desc,
                                                Node* function, Node** args,
                                                Node* frame_state) {
   DCHECK(desc->NeedsFrameState());
   int param_count =
       static_cast<int>(desc->GetMachineSignature()->parameter_count());
-  int input_count = param_count + 4;
+  int input_count = param_count + 2;
   Node** buffer = zone()->NewArray<Node*>(input_count);
   int index = 0;
   buffer[index++] = function;
   for (int i = 0; i < param_count; i++) {
     buffer[index++] = args[i];
   }
   buffer[index++] = frame_state;
-  buffer[index++] = graph()->start();
-  buffer[index++] = graph()->start();
   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);
 
   Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(1);
 
-  return AddNode(common()->Call(descriptor), centry, arg1, ref, arity, context,
-                 graph()->start(), graph()->start());
+  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);
 
   Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(2);
 
   return AddNode(common()->Call(descriptor), centry, arg1, arg2, ref, arity,
-                 context, graph()->start(), graph()->start());
+                 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);
 
   Node* centry = HeapConstant(CEntryStub(isolate(), 1).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, graph()->start(), graph()->start());
+                 ref, arity, context);
 }
 
 
 Node* RawMachineAssembler::TailCallN(CallDescriptor* desc, Node* function,
                                      Node** args) {
   int param_count =
       static_cast<int>(desc->GetMachineSignature()->parameter_count());
-  int input_count = param_count + 3;
+  int input_count = param_count + 1;
   Node** buffer = zone()->NewArray<Node*>(input_count);
   int index = 0;
   buffer[index++] = function;
   for (int i = 0; i < param_count; i++) {
     buffer[index++] = args[i];
   }
-  buffer[index++] = graph()->start();
-  buffer[index++] = graph()->start();
   Node* tail_call = MakeNode(common()->TailCall(desc), input_count, buffer);
   NodeProperties::MergeControlToEnd(graph(), common(), tail_call);
   schedule()->AddTailCall(CurrentBlock(), tail_call);
   current_block_ = nullptr;
   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);
 
   Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(kArity);
 
-  Node* nodes[] = {centry,          arg1, ref, arity, context, graph()->start(),
-                   graph()->start()};
+  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);
 
   Node* centry = HeapConstant(CEntryStub(isolate(), 1).GetCode());
   Node* ref = AddNode(
       common()->ExternalConstant(ExternalReference(function, isolate())));
   Node* arity = Int32Constant(kArity);
 
-  Node* nodes[] = {
-      centry,          arg1, arg2, ref, arity, context, graph()->start(),
-      graph()->start()};
+  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;
   return tail_call;
 }
 
 
 Node* RawMachineAssembler::CallCFunction0(MachineType return_type,
                                           Node* function) {
   MachineSignature::Builder builder(zone(), 1, 0);
   builder.AddReturn(return_type);
   const CallDescriptor* descriptor =
       Linkage::GetSimplifiedCDescriptor(zone(), builder.Build());
 
-  return AddNode(common()->Call(descriptor), function, graph()->start(),
-                 graph()->start());
+  return AddNode(common()->Call(descriptor), function);
 }
 
 
 Node* RawMachineAssembler::CallCFunction1(MachineType return_type,
                                           MachineType arg0_type, Node* function,
                                           Node* arg0) {
   MachineSignature::Builder builder(zone(), 1, 1);
   builder.AddReturn(return_type);
   builder.AddParam(arg0_type);
   const CallDescriptor* descriptor =
       Linkage::GetSimplifiedCDescriptor(zone(), builder.Build());
 
-  return AddNode(common()->Call(descriptor), function, arg0, graph()->start(),
-                 graph()->start());
+  return AddNode(common()->Call(descriptor), function, arg0);
 }
 
 
 Node* RawMachineAssembler::CallCFunction2(MachineType return_type,
                                           MachineType arg0_type,
                                           MachineType arg1_type, Node* function,
                                           Node* arg0, Node* arg1) {
   MachineSignature::Builder builder(zone(), 1, 2);
   builder.AddReturn(return_type);
   builder.AddParam(arg0_type);
   builder.AddParam(arg1_type);
   const CallDescriptor* descriptor =
       Linkage::GetSimplifiedCDescriptor(zone(), builder.Build());
 
-  return AddNode(common()->Call(descriptor), function, arg0, arg1,
-                 graph()->start(), graph()->start());
+  return AddNode(common()->Call(descriptor), function, arg0, arg1);
 }
 
 
 Node* RawMachineAssembler::CallCFunction8(
     MachineType return_type, MachineType arg0_type, MachineType arg1_type,
     MachineType arg2_type, MachineType arg3_type, MachineType arg4_type,
     MachineType arg5_type, MachineType arg6_type, MachineType arg7_type,
     Node* function, Node* arg0, Node* arg1, Node* arg2, Node* arg3, Node* arg4,
     Node* arg5, Node* arg6, Node* arg7) {
   MachineSignature::Builder builder(zone(), 1, 8);
   builder.AddReturn(return_type);
   builder.AddParam(arg0_type);
   builder.AddParam(arg1_type);
   builder.AddParam(arg2_type);
   builder.AddParam(arg3_type);
   builder.AddParam(arg4_type);
   builder.AddParam(arg5_type);
   builder.AddParam(arg6_type);
   builder.AddParam(arg7_type);
-  Node* args[] = {function,
-                  arg0,
-                  arg1,
-                  arg2,
-                  arg3,
-                  arg4,
-                  arg5,
-                  arg6,
-                  arg7,
-                  graph()->start(),
-                  graph()->start()};
+  Node* args[] = {function, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7};
   const CallDescriptor* descriptor =
       Linkage::GetSimplifiedCDescriptor(zone(), builder.Build());
   return AddNode(common()->Call(descriptor), arraysize(args), args);
 }
 
 
 void RawMachineAssembler::Bind(RawMachineLabel* label) {
   DCHECK(current_block_ == nullptr);
   DCHECK(!label->bound_);
   label->bound_ = true;
@@ skipping 39 matching lines @@
 
 RawMachineLabel::RawMachineLabel()
     : block_(NULL), used_(false), bound_(false) {}
 
 
 RawMachineLabel::~RawMachineLabel() { DCHECK(bound_ || !used_); }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8