[turbofan] Change End to take a variable number of inputs.

test/unittests/compiler/scheduler-unittest.cc

Index: test/unittests/compiler/scheduler-unittest.cc
diff --git a/test/unittests/compiler/scheduler-unittest.cc b/test/unittests/compiler/scheduler-unittest.cc
index ffb37018a5be0242631060870582e09fcb324d6c..543ea8a02416cb4dc5a81987c6c8afdeb0636d7b 100644
--- a/test/unittests/compiler/scheduler-unittest.cc
+++ b/test/unittests/compiler/scheduler-unittest.cc
@@ -631,7 +631,7 @@ TEST_F(SchedulerRPOTest, LoopMultibackedge) {
 
 TEST_F(SchedulerTest, BuildScheduleEmpty) {
   graph()->SetStart(graph()->NewNode(common()->Start(0)));
-  graph()->SetEnd(graph()->NewNode(common()->End(), graph()->start()));
+  graph()->SetEnd(graph()->NewNode(common()->End(1), graph()->start()));
   USE(Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kNoFlags));
 }
 
@@ -643,7 +643,7 @@ TEST_F(SchedulerTest, BuildScheduleOneParameter) {
   Node* ret = graph()->NewNode(common()->Return(), p1, graph()->start(),
                                graph()->start());
 
-  graph()->SetEnd(graph()->NewNode(common()->End(), ret));
+  graph()->SetEnd(graph()->NewNode(common()->End(1), ret));
 
   USE(Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kNoFlags));
 }
@@ -668,8 +668,7 @@ TEST_F(SchedulerTest, BuildScheduleIfSplit) {
       graph()->NewNode(common()->Return(), p4, graph()->start(), true_branch);
   Node* ret2 =
       graph()->NewNode(common()->Return(), p5, graph()->start(), false_branch);
-  Node* merge = graph()->NewNode(common()->Merge(2), ret1, ret2);
-  graph()->SetEnd(graph()->NewNode(common()->End(), merge));
+  graph()->SetEnd(graph()->NewNode(common()->End(2), ret1, ret2));
 
   ComputeAndVerifySchedule(13);
 }
@@ -698,7 +697,7 @@ TARGET_TEST_F(SchedulerTest, FloatingDiamond1) {
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* d1 = CreateDiamond(graph(), common(), p0);
   Node* ret = graph()->NewNode(common()->Return(), d1, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -716,7 +715,7 @@ TARGET_TEST_F(SchedulerTest, FloatingDiamond2) {
   Node* d2 = CreateDiamond(graph(), common(), p1);
   Node* add = graph()->NewNode(&kIntAdd, d1, d2);
   Node* ret = graph()->NewNode(common()->Return(), add, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -735,7 +734,7 @@ TARGET_TEST_F(SchedulerTest, FloatingDiamond3) {
   Node* add = graph()->NewNode(&kIntAdd, d1, d2);
   Node* d3 = CreateDiamond(graph(), common(), add);
   Node* ret = graph()->NewNode(common()->Return(), d3, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -772,7 +771,7 @@ TARGET_TEST_F(SchedulerTest, NestedFloatingDiamonds) {
   Node* ephi1 = graph()->NewNode(common()->EffectPhi(2), start, map, m);
 
   Node* ret = graph()->NewNode(common()->Return(), phi, ephi1, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -816,7 +815,7 @@ TARGET_TEST_F(SchedulerTest, NestedFloatingDiamondWithChain) {
 
   Node* add = graph()->NewNode(&kIntAdd, phiA2, phiB2);
   Node* ret = graph()->NewNode(common()->Return(), add, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -850,7 +849,7 @@ TARGET_TEST_F(SchedulerTest, NestedFloatingDiamondWithLoop) {
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), fv, ind, m);
 
   Node* ret = graph()->NewNode(common()->Return(), phi, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -883,7 +882,7 @@ TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond1) {
   ind->ReplaceInput(1, phi1);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
-  Node* end = graph()->NewNode(common()->End(), ret, f);
+  Node* end = graph()->NewNode(common()->End(2), ret, f);
 
   graph()->SetEnd(end);
 
@@ -917,7 +916,7 @@ TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond2) {
   ind->ReplaceInput(1, add);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
-  Node* end = graph()->NewNode(common()->End(), ret, f);
+  Node* end = graph()->NewNode(common()->End(2), ret, f);
 
   graph()->SetEnd(end);
 
@@ -963,7 +962,7 @@ TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond3) {
   ind->ReplaceInput(1, add);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
-  Node* end = graph()->NewNode(common()->End(), ret, f);
+  Node* end = graph()->NewNode(common()->End(2), ret, f);
 
   graph()->SetEnd(end);
 
@@ -997,7 +996,7 @@ TARGET_TEST_F(SchedulerTest, PhisPushedDownToDifferentBranches) {
       graph()->NewNode(common()->Phi(kMachAnyTagged, 2), phi, phi2, m2);
 
   Node* ret = graph()->NewNode(common()->Return(), phi3, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -1018,7 +1017,7 @@ TARGET_TEST_F(SchedulerTest, BranchHintTrue) {
   Node* m = graph()->NewNode(common()->Merge(2), t, f);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), tv, fv, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -1042,7 +1041,7 @@ TARGET_TEST_F(SchedulerTest, BranchHintFalse) {
   Node* m = graph()->NewNode(common()->Merge(2), t, f);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), tv, fv, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -1068,7 +1067,7 @@ TARGET_TEST_F(SchedulerTest, CallException) {
   Node* m = graph()->NewNode(common()->Merge(2), ok2, hdl);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), c2, p0, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, m);
-  Node* end = graph()->NewNode(common()->End(), ret);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -1087,7 +1086,7 @@ TARGET_TEST_F(SchedulerTest, TailCall) {
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* call = graph()->NewNode(&kMockTailCall, p0, start, start);
-  Node* end = graph()->NewNode(common()->End(), call);
+  Node* end = graph()->NewNode(common()->End(1), call);
 
   graph()->SetEnd(end);
 
@@ -1110,7 +1109,7 @@ TARGET_TEST_F(SchedulerTest, Switch) {
   Node* m = graph()->NewNode(common()->Merge(3), c0, c1, d);
   Node* phi = graph()->NewNode(common()->Phi(kMachInt32, 3), v0, v1, vd, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, m);
-  Node* end = graph()->NewNode(common()->End(), ret);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -1133,7 +1132,7 @@ TARGET_TEST_F(SchedulerTest, FloatingSwitch) {
   Node* m = graph()->NewNode(common()->Merge(3), c0, c1, d);
   Node* phi = graph()->NewNode(common()->Phi(kMachInt32, 3), v0, v1, vd, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
@@ -1153,7 +1152,7 @@ TARGET_TEST_F(SchedulerTest, Terminate) {
   Node* terminate = graph()->NewNode(common()->Terminate(), effect, loop);
   effect->ReplaceInput(1, terminate);
 
-  Node* end = graph()->NewNode(common()->End(), terminate);
+  Node* end = graph()->NewNode(common()->End(1), terminate);
 
   graph()->SetEnd(end);