Cleanup scheduler unit test a bit.

test/unittests/compiler/scheduler-unittest.cc

 // Copyright 2015 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/access-builder.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/graph-visualizer.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/node.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
 #include "src/compiler/schedule.h"
 #include "src/compiler/scheduler.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/compiler/verifier.h"
 #include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/test-utils.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+using testing::AnyOf;
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 class SchedulerTest : public TestWithZone {
  public:
   SchedulerTest()
       : graph_(zone()), common_(zone()), simplified_(zone()), js_(zone()) {}
 
-  static Schedule* ComputeAndVerifySchedule(int expected, Graph* graph) {
+  Schedule* ComputeAndVerifySchedule(size_t expected) {
     if (FLAG_trace_turbo) {
       OFStream os(stdout);
-      os << AsDOT(*graph);
+      os << AsDOT(*graph());
     }
 
-    Schedule* schedule = Scheduler::ComputeSchedule(graph->zone(), graph,
-                                                    Scheduler::kSplitNodes);
+    Schedule* schedule =
+        Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kSplitNodes);
 
     if (FLAG_trace_turbo_scheduler) {
       OFStream os(stdout);
       os << *schedule << std::endl;
     }
     ScheduleVerifier::Run(schedule);
-    CHECK_EQ(expected, GetScheduledNodeCount(schedule));
+    EXPECT_EQ(expected, GetScheduledNodeCount(schedule));
     return schedule;
   }
 
-  static int GetScheduledNodeCount(const Schedule* schedule) {
+  size_t GetScheduledNodeCount(const Schedule* schedule) {
     size_t node_count = 0;
     for (auto block : *schedule->rpo_order()) {
       node_count += block->NodeCount();
       if (block->control() != BasicBlock::kNone) ++node_count;
     }
-    return static_cast<int>(node_count);
+    return node_count;
   }
 
   Graph* graph() { return &graph_; }
   CommonOperatorBuilder* common() { return &common_; }
   SimplifiedOperatorBuilder* simplified() { return &simplified_; }
   JSOperatorBuilder* js() { return &js_; }
 
  private:
   Graph graph_;
   CommonOperatorBuilder common_;
   SimplifiedOperatorBuilder simplified_;
   JSOperatorBuilder js_;
 };
 
 
 class SchedulerRPOTest : public SchedulerTest {
  public:
   SchedulerRPOTest() {}
 
   // TODO(titzer): pull RPO tests out to their own file.
-  static void CheckRPONumbers(BasicBlockVector* order, size_t expected,
-                              bool loops_allowed) {
+  void CheckRPONumbers(BasicBlockVector* order, size_t expected,
+                       bool loops_allowed) {
     CHECK(expected == order->size());
     for (int i = 0; i < static_cast<int>(order->size()); i++) {
       CHECK(order->at(i)->rpo_number() == i);
       if (!loops_allowed) {
         CHECK(!order->at(i)->loop_end());
         CHECK(!order->at(i)->loop_header());
       }
     }
   }
 
-  static void CheckLoop(BasicBlockVector* order, BasicBlock** blocks,
-                        int body_size) {
+  void CheckLoop(BasicBlockVector* order, BasicBlock** blocks, int body_size) {
     BasicBlock* header = blocks[0];
     BasicBlock* end = header->loop_end();
     CHECK(end);
     CHECK_GT(end->rpo_number(), 0);
     CHECK_EQ(body_size, end->rpo_number() - header->rpo_number());
     for (int i = 0; i < body_size; i++) {
       CHECK_GE(blocks[i]->rpo_number(), header->rpo_number());
       CHECK_LT(blocks[i]->rpo_number(), end->rpo_number());
       CHECK(header->LoopContains(blocks[i]));
       CHECK(header->IsLoopHeader() || blocks[i]->loop_header() == header);
     }
     if (header->rpo_number() > 0) {
       CHECK_NE(order->at(header->rpo_number() - 1)->loop_header(), header);
     }
     if (end->rpo_number() < static_cast<int>(order->size())) {
       CHECK_NE(order->at(end->rpo_number())->loop_header(), header);
     }
   }
 
   struct TestLoop {
     int count;
     BasicBlock** nodes;
     BasicBlock* header() { return nodes[0]; }
     BasicBlock* last() { return nodes[count - 1]; }
     ~TestLoop() { delete[] nodes; }
-
-    void Check(BasicBlockVector* order) { CheckLoop(order, nodes, count); }
   };
 
-  static TestLoop* CreateLoop(Schedule* schedule, int count) {
+  TestLoop* CreateLoop(Schedule* schedule, int count) {
     TestLoop* loop = new TestLoop();
     loop->count = count;
     loop->nodes = new BasicBlock* [count];
     for (int i = 0; i < count; i++) {
       loop->nodes[i] = schedule->NewBasicBlock();
       if (i > 0) {
         schedule->AddSuccessorForTesting(loop->nodes[i - 1], loop->nodes[i]);
       }
     }
     schedule->AddSuccessorForTesting(loop->nodes[count - 1], loop->nodes[0]);
     return loop;
   }
 };
 
 
-class SchedulerTestWithIsolate : public SchedulerTest, public TestWithIsolate {
- public:
-  SchedulerTestWithIsolate() {}
-
-  Unique<HeapObject> GetUniqueUndefined() {
-    Handle<HeapObject> object =
-        Handle<HeapObject>(isolate()->heap()->undefined_value(), isolate());
-    return Unique<HeapObject>::CreateUninitialized(object);
-  }
-};
-
 namespace {
 
+const Operator kHeapConstant(IrOpcode::kHeapConstant, Operator::kPure,
+                             "HeapConstant", 0, 0, 0, 1, 0, 0);
 const Operator kIntAdd(IrOpcode::kInt32Add, Operator::kPure, "Int32Add", 2, 0,
                        0, 1, 0, 0);
 
 }  // namespace
 
 
-TEST_F(SchedulerTest, BuildScheduleEmpty) {
-  graph()->SetStart(graph()->NewNode(common()->Start(0)));
-  graph()->SetEnd(graph()->NewNode(common()->End(), graph()->start()));
-  USE(Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kNoFlags));
-}
-
-
-TEST_F(SchedulerTest, BuildScheduleOneParameter) {
-  graph()->SetStart(graph()->NewNode(common()->Start(0)));
-
-  Node* p1 = graph()->NewNode(common()->Parameter(0), graph()->start());
-  Node* ret = graph()->NewNode(common()->Return(), p1, graph()->start(),
-                               graph()->start());
-
-  graph()->SetEnd(graph()->NewNode(common()->End(), ret));
-
-  USE(Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kNoFlags));
-}
-
-
-TEST_F(SchedulerTest, BuildScheduleIfSplit) {
-  graph()->SetStart(graph()->NewNode(common()->Start(3)));
-
-  Node* p1 = graph()->NewNode(common()->Parameter(0), graph()->start());
-  Node* p2 = graph()->NewNode(common()->Parameter(1), graph()->start());
-  Node* p3 = graph()->NewNode(common()->Parameter(2), graph()->start());
-  Node* p4 = graph()->NewNode(common()->Parameter(3), graph()->start());
-  Node* p5 = graph()->NewNode(common()->Parameter(4), graph()->start());
-  Node* cmp = graph()->NewNode(js()->LessThanOrEqual(), p1, p2, p3,
-                               graph()->start(), graph()->start());
-  Node* branch = graph()->NewNode(common()->Branch(), cmp, graph()->start());
-  Node* true_branch = graph()->NewNode(common()->IfTrue(), branch);
-  Node* false_branch = graph()->NewNode(common()->IfFalse(), branch);
-
-  Node* ret1 =
-      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));
-
-  ComputeAndVerifySchedule(13, graph());
-}
+// -----------------------------------------------------------------------------
+// Special reverse-post-order block ordering.
 
 
 TEST_F(SchedulerRPOTest, Degenerate1) {
   Schedule schedule(zone());
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 1, false);
-  CHECK_EQ(schedule.start(), order->at(0));
+  EXPECT_EQ(schedule.start(), order->at(0));
 }
 
 
 TEST_F(SchedulerRPOTest, Degenerate2) {
   Schedule schedule(zone());
 
   schedule.AddGoto(schedule.start(), schedule.end());
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 2, false);
-  CHECK_EQ(schedule.start(), order->at(0));
-  CHECK_EQ(schedule.end(), order->at(1));
+  EXPECT_EQ(schedule.start(), order->at(0));
+  EXPECT_EQ(schedule.end(), order->at(1));
 }
 
 
 TEST_F(SchedulerRPOTest, Line) {
   for (int i = 0; i < 10; i++) {
     Schedule schedule(zone());
 
     BasicBlock* last = schedule.start();
     for (int j = 0; j < i; j++) {
       BasicBlock* block = schedule.NewBasicBlock();
       block->set_deferred(i & 1);
       schedule.AddGoto(last, block);
       last = block;
     }
     BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
     CheckRPONumbers(order, 1 + i, false);
 
     for (size_t i = 0; i < schedule.BasicBlockCount(); i++) {
       BasicBlock* block = schedule.GetBlockById(BasicBlock::Id::FromSize(i));
       if (block->rpo_number() >= 0 && block->SuccessorCount() == 1) {
-        CHECK(block->rpo_number() + 1 == block->SuccessorAt(0)->rpo_number());
+        EXPECT_EQ(block->rpo_number() + 1, block->SuccessorAt(0)->rpo_number());
       }
     }
   }
 }
 
 
 TEST_F(SchedulerRPOTest, SelfLoop) {
   Schedule schedule(zone());
   schedule.AddSuccessorForTesting(schedule.start(), schedule.start());
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
@@ skipping 14 matching lines @@
   CheckLoop(order, loop, 2);
 }
 
 
 TEST_F(SchedulerRPOTest, EndLoop) {
   Schedule schedule(zone());
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
   schedule.AddSuccessorForTesting(schedule.start(), loop1->header());
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 3, true);
-  loop1->Check(order);
+  CheckLoop(order, loop1->nodes, loop1->count);
 }
 
 
 TEST_F(SchedulerRPOTest, EndLoopNested) {
   Schedule schedule(zone());
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
   schedule.AddSuccessorForTesting(schedule.start(), loop1->header());
   schedule.AddSuccessorForTesting(loop1->last(), schedule.start());
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 3, true);
-  loop1->Check(order);
+  CheckLoop(order, loop1->nodes, loop1->count);
 }
 
 
 TEST_F(SchedulerRPOTest, Diamond) {
   Schedule schedule(zone());
 
   BasicBlock* A = schedule.start();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.end();
 
   schedule.AddSuccessorForTesting(A, B);
   schedule.AddSuccessorForTesting(A, C);
   schedule.AddSuccessorForTesting(B, D);
   schedule.AddSuccessorForTesting(C, D);
 
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 4, false);
 
-  CHECK_EQ(0, A->rpo_number());
-  CHECK((B->rpo_number() == 1 && C->rpo_number() == 2) ||
-        (B->rpo_number() == 2 && C->rpo_number() == 1));
-  CHECK_EQ(3, D->rpo_number());
+  EXPECT_EQ(0, A->rpo_number());
+  EXPECT_THAT(B->rpo_number(), AnyOf(1, 2));
+  EXPECT_THAT(C->rpo_number(), AnyOf(1, 2));
+  EXPECT_EQ(3, D->rpo_number());
 }
 
 
 TEST_F(SchedulerRPOTest, Loop1) {
   Schedule schedule(zone());
 
   BasicBlock* A = schedule.start();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.end();
@@ skipping 144 matching lines @@
 
   BasicBlock* A = schedule.start();
   BasicBlock* E = schedule.end();
 
   schedule.AddSuccessorForTesting(A, loop1->header());
   schedule.AddSuccessorForTesting(loop1->header(), loop2->header());
   schedule.AddSuccessorForTesting(loop2->last(), E);
 
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
 
-  CHECK_EQ(static_cast<int>(schedule.BasicBlockCount()),
-           static_cast<int>(order->size()));
-
-  loop1->Check(order);
-  loop2->Check(order);
+  EXPECT_EQ(schedule.BasicBlockCount(), order->size());
+  CheckLoop(order, loop1->nodes, loop1->count);
+  CheckLoop(order, loop2->nodes, loop2->count);
 }
 
 
 TEST_F(SchedulerRPOTest, LoopFollow2) {
   Schedule schedule(zone());
 
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
   SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
 
   BasicBlock* A = schedule.start();
   BasicBlock* S = schedule.NewBasicBlock();
   BasicBlock* E = schedule.end();
 
   schedule.AddSuccessorForTesting(A, loop1->header());
   schedule.AddSuccessorForTesting(loop1->header(), S);
   schedule.AddSuccessorForTesting(S, loop2->header());
   schedule.AddSuccessorForTesting(loop2->last(), E);
 
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
 
-  CHECK_EQ(static_cast<int>(schedule.BasicBlockCount()),
-           static_cast<int>(order->size()));
-  loop1->Check(order);
-  loop2->Check(order);
+  EXPECT_EQ(schedule.BasicBlockCount(), order->size());
+  CheckLoop(order, loop1->nodes, loop1->count);
+  CheckLoop(order, loop2->nodes, loop2->count);
 }
 
 
 TEST_F(SchedulerRPOTest, LoopFollowN) {
   for (int size = 1; size < 5; size++) {
     for (int exit = 0; exit < size; exit++) {
       Schedule schedule(zone());
       SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
       SmartPointer<TestLoop> loop2(CreateLoop(&schedule, size));
       BasicBlock* A = schedule.start();
       BasicBlock* E = schedule.end();
 
       schedule.AddSuccessorForTesting(A, loop1->header());
       schedule.AddSuccessorForTesting(loop1->nodes[exit], loop2->header());
       schedule.AddSuccessorForTesting(loop2->nodes[exit], E);
       BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
 
-      CHECK_EQ(static_cast<int>(schedule.BasicBlockCount()),
-               static_cast<int>(order->size()));
-      loop1->Check(order);
-      loop2->Check(order);
+      EXPECT_EQ(schedule.BasicBlockCount(), order->size());
+      CheckLoop(order, loop1->nodes, loop1->count);
+      CheckLoop(order, loop2->nodes, loop2->count);
     }
   }
 }
 
 
 TEST_F(SchedulerRPOTest, NestedLoopFollow1) {
   Schedule schedule(zone());
 
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
   SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
 
   BasicBlock* A = schedule.start();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* E = schedule.end();
 
   schedule.AddSuccessorForTesting(A, B);
   schedule.AddSuccessorForTesting(B, loop1->header());
   schedule.AddSuccessorForTesting(loop1->header(), loop2->header());
   schedule.AddSuccessorForTesting(loop2->last(), C);
   schedule.AddSuccessorForTesting(C, E);
   schedule.AddSuccessorForTesting(C, B);
 
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
 
-  CHECK_EQ(static_cast<int>(schedule.BasicBlockCount()),
-           static_cast<int>(order->size()));
-  loop1->Check(order);
-  loop2->Check(order);
+  EXPECT_EQ(schedule.BasicBlockCount(), order->size());
+  CheckLoop(order, loop1->nodes, loop1->count);
+  CheckLoop(order, loop2->nodes, loop2->count);
 
   BasicBlock* loop3[] = {B, loop1->nodes[0], loop2->nodes[0], C};
   CheckLoop(order, loop3, 4);
 }
 
 
 TEST_F(SchedulerRPOTest, LoopBackedges1) {
   int size = 8;
   for (int i = 0; i < size; i++) {
     for (int j = 0; j < size; j++) {
       Schedule schedule(zone());
       BasicBlock* A = schedule.start();
       BasicBlock* E = schedule.end();
 
       SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
       schedule.AddSuccessorForTesting(A, loop1->header());
       schedule.AddSuccessorForTesting(loop1->last(), E);
 
       schedule.AddSuccessorForTesting(loop1->nodes[i], loop1->header());
       schedule.AddSuccessorForTesting(loop1->nodes[j], E);
 
       BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
       CheckRPONumbers(order, schedule.BasicBlockCount(), true);
-      loop1->Check(order);
+      CheckLoop(order, loop1->nodes, loop1->count);
     }
   }
 }
 
 
 TEST_F(SchedulerRPOTest, LoopOutedges1) {
   int size = 8;
   for (int i = 0; i < size; i++) {
     for (int j = 0; j < size; j++) {
       Schedule schedule(zone());
       BasicBlock* A = schedule.start();
       BasicBlock* D = schedule.NewBasicBlock();
       BasicBlock* E = schedule.end();
 
       SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
       schedule.AddSuccessorForTesting(A, loop1->header());
       schedule.AddSuccessorForTesting(loop1->last(), E);
 
       schedule.AddSuccessorForTesting(loop1->nodes[i], loop1->header());
       schedule.AddSuccessorForTesting(loop1->nodes[j], D);
       schedule.AddSuccessorForTesting(D, E);
 
       BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
       CheckRPONumbers(order, schedule.BasicBlockCount(), true);
-      loop1->Check(order);
+      CheckLoop(order, loop1->nodes, loop1->count);
     }
   }
 }
 
 
 TEST_F(SchedulerRPOTest, LoopOutedges2) {
   int size = 8;
   for (int i = 0; i < size; i++) {
     Schedule schedule(zone());
     BasicBlock* A = schedule.start();
     BasicBlock* E = schedule.end();
 
     SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
     schedule.AddSuccessorForTesting(A, loop1->header());
     schedule.AddSuccessorForTesting(loop1->last(), E);
 
     for (int j = 0; j < size; j++) {
       BasicBlock* O = schedule.NewBasicBlock();
       schedule.AddSuccessorForTesting(loop1->nodes[j], O);
       schedule.AddSuccessorForTesting(O, E);
     }
 
     BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
     CheckRPONumbers(order, schedule.BasicBlockCount(), true);
-    loop1->Check(order);
+    CheckLoop(order, loop1->nodes, loop1->count);
   }
 }
 
 
 TEST_F(SchedulerRPOTest, LoopOutloops1) {
   int size = 8;
   for (int i = 0; i < size; i++) {
     Schedule schedule(zone());
     BasicBlock* A = schedule.start();
     BasicBlock* E = schedule.end();
     SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
     schedule.AddSuccessorForTesting(A, loop1->header());
     schedule.AddSuccessorForTesting(loop1->last(), E);
 
     TestLoop** loopN = new TestLoop* [size];
     for (int j = 0; j < size; j++) {
       loopN[j] = CreateLoop(&schedule, 2);
       schedule.AddSuccessorForTesting(loop1->nodes[j], loopN[j]->header());
       schedule.AddSuccessorForTesting(loopN[j]->last(), E);
     }
 
     BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
     CheckRPONumbers(order, schedule.BasicBlockCount(), true);
-    loop1->Check(order);
+    CheckLoop(order, loop1->nodes, loop1->count);
 
     for (int j = 0; j < size; j++) {
-      loopN[j]->Check(order);
+      CheckLoop(order, loopN[j]->nodes, loopN[j]->count);
       delete loopN[j];
     }
     delete[] loopN;
   }
 }
 
 
 TEST_F(SchedulerRPOTest, LoopMultibackedge) {
   Schedule schedule(zone());
 
@@ skipping 12 matching lines @@
   schedule.AddSuccessorForTesting(E, B);
 
   BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 5, true);
 
   BasicBlock* loop1[] = {B, C, D, E};
   CheckLoop(order, loop1, 4);
 }
 
 
-TEST_F(SchedulerTestWithIsolate, BuildScheduleIfSplitWithEffects) {
+// -----------------------------------------------------------------------------
+// Graph end-to-end scheduling.
+
+
+TEST_F(SchedulerTest, BuildScheduleEmpty) {
+  graph()->SetStart(graph()->NewNode(common()->Start(0)));
+  graph()->SetEnd(graph()->NewNode(common()->End(), graph()->start()));
+  USE(Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kNoFlags));
+}
+
+
+TEST_F(SchedulerTest, BuildScheduleOneParameter) {
+  graph()->SetStart(graph()->NewNode(common()->Start(0)));
+
+  Node* p1 = graph()->NewNode(common()->Parameter(0), graph()->start());
+  Node* ret = graph()->NewNode(common()->Return(), p1, graph()->start(),
+                               graph()->start());
+
+  graph()->SetEnd(graph()->NewNode(common()->End(), ret));
+
+  USE(Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kNoFlags));
+}
+
+
+TEST_F(SchedulerTest, BuildScheduleIfSplit) {
+  graph()->SetStart(graph()->NewNode(common()->Start(3)));
+
+  Node* p1 = graph()->NewNode(common()->Parameter(0), graph()->start());
+  Node* p2 = graph()->NewNode(common()->Parameter(1), graph()->start());
+  Node* p3 = graph()->NewNode(common()->Parameter(2), graph()->start());
+  Node* p4 = graph()->NewNode(common()->Parameter(3), graph()->start());
+  Node* p5 = graph()->NewNode(common()->Parameter(4), graph()->start());
+  Node* cmp = graph()->NewNode(js()->LessThanOrEqual(), p1, p2, p3,
+                               graph()->start(), graph()->start());
+  Node* branch = graph()->NewNode(common()->Branch(), cmp, graph()->start());
+  Node* true_branch = graph()->NewNode(common()->IfTrue(), branch);
+  Node* false_branch = graph()->NewNode(common()->IfFalse(), branch);
+
+  Node* ret1 =
+      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));
+
+  ComputeAndVerifySchedule(13);
+}
+
+
+TEST_F(SchedulerTest, BuildScheduleIfSplitWithEffects) {
   const Operator* op;
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b, c, y) {
   //   if (a < b) {
   //     return a + b - c * c - a + y;
   //   } else {
   //     return c * c - a;
   //   }
   // }
@@ skipping 23 matching lines @@
   Node* n11 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n11);
   op = common()->Parameter(0);
   Node* n2 = graph()->NewNode(op, n0);
   USE(n2);
   n11->ReplaceInput(0, n2);
   op = common()->Parameter(0);
   Node* n3 = graph()->NewNode(op, n0);
   USE(n3);
   n11->ReplaceInput(1, n3);
-  op = common()->HeapConstant(GetUniqueUndefined());
+  op = &kHeapConstant;
   Node* n7 = graph()->NewNode(op);
   USE(n7);
   n11->ReplaceInput(2, n7);
   op = js()->LessThan();
   Node* n8 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n8);
   n8->ReplaceInput(0, n2);
   n8->ReplaceInput(1, n3);
   n8->ReplaceInput(2, n7);
   n8->ReplaceInput(3, n0);
@@ skipping 67 matching lines @@
   n20->ReplaceInput(4, n18);
   n21->ReplaceInput(0, n20);
   n21->ReplaceInput(1, n20);
   n21->ReplaceInput(2, n18);
   n22->ReplaceInput(1, n21);
   n23->ReplaceInput(0, n22);
 
   graph()->SetStart(n0);
   graph()->SetEnd(n23);
 
-  ComputeAndVerifySchedule(20, graph());
+  ComputeAndVerifySchedule(20);
 }
 
 
-TEST_F(SchedulerTestWithIsolate, BuildScheduleSimpleLoop) {
+TEST_F(SchedulerTest, BuildScheduleSimpleLoop) {
   const Operator* op;
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b) {
   //   while (a < b) {
   //     a++;
   //   }
   //   return a;
   // }
   op = common()->Start(0);
@@ skipping 13 matching lines @@
   Node* n2 = graph()->NewNode(op, n0);
   USE(n2);
   n8->ReplaceInput(0, n2);
   op = js()->Add();
   Node* n18 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n18);
   op = js()->ToNumber();
   Node* n16 = graph()->NewNode(op, nil, nil, nil, nil);
   USE(n16);
   n16->ReplaceInput(0, n8);
-  op = common()->HeapConstant(GetUniqueUndefined());
+  op = &kHeapConstant;
   Node* n5 = graph()->NewNode(op);
   USE(n5);
   n16->ReplaceInput(1, n5);
   op = js()->LessThan();
   Node* n12 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n12);
   n12->ReplaceInput(0, n8);
   op = common()->Phi(kMachAnyTagged, 2);
   Node* n9 = graph()->NewNode(op, nil, nil, nil);
   USE(n9);
@@ skipping 44 matching lines @@
   op = common()->IfFalse();
   Node* n15 = graph()->NewNode(op, nil);
   USE(n15);
   n15->ReplaceInput(0, n13);
   n19->ReplaceInput(2, n15);
   n20->ReplaceInput(0, n19);
 
   graph()->SetStart(n0);
   graph()->SetEnd(n20);
 
-  ComputeAndVerifySchedule(19, graph());
+  ComputeAndVerifySchedule(19);
 }
 
 
-TEST_F(SchedulerTestWithIsolate, BuildScheduleComplexLoops) {
+TEST_F(SchedulerTest, BuildScheduleComplexLoops) {
   const Operator* op;
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b, c) {
   //   while (a < b) {
   //     a++;
   //     while (c < b) {
   //       c++;
   //     }
   //   }
@@ skipping 25 matching lines @@
   op = common()->Phi(kMachAnyTagged, 2);
   Node* n23 = graph()->NewNode(op, nil, nil, nil);
   USE(n23);
   op = js()->Add();
   Node* n20 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n20);
   op = js()->ToNumber();
   Node* n18 = graph()->NewNode(op, nil, nil, nil, nil);
   USE(n18);
   n18->ReplaceInput(0, n9);
-  op = common()->HeapConstant(GetUniqueUndefined());
+  op = &kHeapConstant;
   Node* n6 = graph()->NewNode(op);
   USE(n6);
   n18->ReplaceInput(1, n6);
   op = js()->LessThan();
   Node* n14 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n14);
   n14->ReplaceInput(0, n9);
   op = common()->Phi(kMachAnyTagged, 2);
   Node* n10 = graph()->NewNode(op, nil, nil, nil);
   USE(n10);
@@ skipping 167 matching lines @@
   op = common()->IfFalse();
   Node* n42 = graph()->NewNode(op, nil);
   USE(n42);
   n42->ReplaceInput(0, n40);
   n45->ReplaceInput(2, n42);
   n46->ReplaceInput(0, n45);
 
   graph()->SetStart(n0);
   graph()->SetEnd(n46);
 
-  ComputeAndVerifySchedule(46, graph());
+  ComputeAndVerifySchedule(46);
 }
 
 
-TEST_F(SchedulerTestWithIsolate, BuildScheduleBreakAndContinue) {
+TEST_F(SchedulerTest, BuildScheduleBreakAndContinue) {
   const Operator* op;
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b, c) {
   //   var d = 0;
   //   while (a < b) {
   //     a++;
   //     while (c < b) {
   //       c++;
   //       if (d == 0) break;
@@ skipping 27 matching lines @@
   op = common()->Phi(kMachAnyTagged, 2);
   Node* n25 = graph()->NewNode(op, nil, nil, nil);
   USE(n25);
   op = js()->Add();
   Node* n22 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n22);
   op = js()->ToNumber();
   Node* n20 = graph()->NewNode(op, nil, nil, nil, nil);
   USE(n20);
   n20->ReplaceInput(0, n10);
-  op = common()->HeapConstant(GetUniqueUndefined());
+  op = &kHeapConstant;
   Node* n6 = graph()->NewNode(op);
   USE(n6);
   n20->ReplaceInput(1, n6);
   op = js()->LessThan();
   Node* n16 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n16);
   n16->ReplaceInput(0, n10);
   op = common()->Phi(kMachAnyTagged, 2);
   Node* n11 = graph()->NewNode(op, nil, nil, nil);
   USE(n11);
@@ skipping 247 matching lines @@
   n19->ReplaceInput(0, n17);
   n56->ReplaceInput(4, n19);
   n57->ReplaceInput(0, n56);
   n57->ReplaceInput(1, n56);
   n57->ReplaceInput(2, n19);
   n58->ReplaceInput(0, n57);
 
   graph()->SetStart(n0);
   graph()->SetEnd(n58);
 
-  ComputeAndVerifySchedule(62, graph());
+  ComputeAndVerifySchedule(62);
 }
 
 
-TEST_F(SchedulerTestWithIsolate, BuildScheduleSimpleLoopWithCodeMotion) {
+TEST_F(SchedulerTest, BuildScheduleSimpleLoopWithCodeMotion) {
   const Operator* op;
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b, c) {
   //   while (a < b) {
   //     a += b + c;
   //   }
   //   return a;
   // }
   op = common()->Start(0);
@@ skipping 39 matching lines @@
   Node* n16 = graph()->NewNode(op, nil, nil);
   USE(n16);
   op = js()->ToBoolean();
   Node* n15 = graph()->NewNode(op, nil, nil, nil, nil);
   USE(n15);
   op = js()->LessThan();
   Node* n14 = graph()->NewNode(op, nil, nil, nil, nil, nil);
   USE(n14);
   n14->ReplaceInput(0, n9);
   n14->ReplaceInput(1, n10);
-  op = common()->HeapConstant(GetUniqueUndefined());
+  op = &kHeapConstant;
   Node* n6 = graph()->NewNode(op);
   USE(n6);
   n14->ReplaceInput(2, n6);
   op = common()->Phi(kMachAnyTagged, 2);
   Node* n12 = graph()->NewNode(op, nil, nil, nil);
   USE(n12);
   n12->ReplaceInput(0, n0);
   n12->ReplaceInput(1, n20);
   n12->ReplaceInput(2, n7);
   n14->ReplaceInput(3, n12);
@@ skipping 29 matching lines @@
   op = common()->IfFalse();
   Node* n18 = graph()->NewNode(op, nil);
   USE(n18);
   n18->ReplaceInput(0, n16);
   n21->ReplaceInput(2, n18);
   n22->ReplaceInput(0, n21);
 
   graph()->SetStart(n0);
   graph()->SetEnd(n22);
 
-  Schedule* schedule = ComputeAndVerifySchedule(19, graph());
+  Schedule* schedule = ComputeAndVerifySchedule(19);
   // Make sure the integer-only add gets hoisted to a different block that the
   // JSAdd.
-  CHECK(schedule->block(n19) != schedule->block(n20));
+  EXPECT_NE(schedule->block(n19), schedule->block(n20));
 }
 
 
 namespace {
 
 Node* CreateDiamond(Graph* graph, CommonOperatorBuilder* common, Node* cond) {
   Node* tv = graph->NewNode(common->Int32Constant(6));
   Node* fv = graph->NewNode(common->Int32Constant(7));
   Node* br = graph->NewNode(common->Branch(), cond, graph->start());
   Node* t = graph->NewNode(common->IfTrue(), br);
@@ skipping 10 matching lines @@
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   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);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(13, graph());
+  ComputeAndVerifySchedule(13);
 }
 
 
 TARGET_TEST_F(SchedulerTest, FloatingDiamond2) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* p1 = graph()->NewNode(common()->Parameter(1), start);
   Node* d1 = CreateDiamond(graph(), common(), p0);
   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);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(24, graph());
+  ComputeAndVerifySchedule(24);
 }
 
 
 TARGET_TEST_F(SchedulerTest, FloatingDiamond3) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* p1 = graph()->NewNode(common()->Parameter(1), start);
   Node* d1 = CreateDiamond(graph(), common(), p0);
   Node* d2 = CreateDiamond(graph(), common(), p1);
   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);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(33, graph());
+  ComputeAndVerifySchedule(33);
 }
 
 
 TARGET_TEST_F(SchedulerTest, NestedFloatingDiamonds) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
 
   Node* fv = graph()->NewNode(common()->Int32Constant(7));
@@ skipping 16 matching lines @@
 
   Node* m = graph()->NewNode(common()->Merge(2), t, f);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), fv, phi1, m);
   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);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(23, graph());
+  ComputeAndVerifySchedule(23);
 }
 
 
 TARGET_TEST_F(SchedulerTest, NestedFloatingDiamondWithChain) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* p1 = graph()->NewNode(common()->Parameter(1), start);
   Node* c = graph()->NewNode(common()->Int32Constant(7));
@@ skipping 23 matching lines @@
   Node* mB2 = graph()->NewNode(common()->Merge(2), tB2, fB2);
   Node* phiB2 =
       graph()->NewNode(common()->Phi(kMachAnyTagged, 2), phiA1, c, mB2);
 
   Node* add = graph()->NewNode(&kIntAdd, phiA2, phiB2);
   Node* ret = graph()->NewNode(common()->Return(), add, start, start);
   Node* end = graph()->NewNode(common()->End(), ret, start);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(36, graph());
+  ComputeAndVerifySchedule(36);
 }
 
 
 TARGET_TEST_F(SchedulerTest, NestedFloatingDiamondWithLoop) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
 
   Node* fv = graph()->NewNode(common()->Int32Constant(7));
@@ skipping 13 matching lines @@
   ind->ReplaceInput(1, ind);  // close induction variable.
 
   Node* m = graph()->NewNode(common()->Merge(2), t, f1);
   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);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(20, graph());
+  ComputeAndVerifySchedule(20);
 }
 
 
 TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond1) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
 
   Node* c = graph()->NewNode(common()->Int32Constant(7));
@@ skipping 12 matching lines @@
   Node* phi1 = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), add, p0, m1);
 
   loop->ReplaceInput(1, t);    // close loop.
   ind->ReplaceInput(1, phi1);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
   Node* end = graph()->NewNode(common()->End(), ret, f);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(20, graph());
+  ComputeAndVerifySchedule(20);
 }
 
 
 TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond2) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
 
   Node* c = graph()->NewNode(common()->Int32Constant(7));
@@ skipping 13 matching lines @@
   Node* f = graph()->NewNode(common()->IfFalse(), br);
 
   loop->ReplaceInput(1, t);   // close loop.
   ind->ReplaceInput(1, add);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
   Node* end = graph()->NewNode(common()->End(), ret, f);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(20, graph());
+  ComputeAndVerifySchedule(20);
 }
 
 
 TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond3) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
 
   Node* c = graph()->NewNode(common()->Int32Constant(7));
@@ skipping 25 matching lines @@
   Node* f = graph()->NewNode(common()->IfFalse(), br);
 
   loop->ReplaceInput(1, t);   // close loop.
   ind->ReplaceInput(1, add);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
   Node* end = graph()->NewNode(common()->End(), ret, f);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(28, graph());
+  ComputeAndVerifySchedule(28);
 }
 
 
 TARGET_TEST_F(SchedulerTest, PhisPushedDownToDifferentBranches) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* p1 = graph()->NewNode(common()->Parameter(1), start);
 
@@ skipping 13 matching lines @@
   Node* f2 = graph()->NewNode(common()->IfFalse(), br2);
   Node* m2 = graph()->NewNode(common()->Merge(2), t2, f2);
   Node* phi3 =
       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);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(24, graph());
+  ComputeAndVerifySchedule(24);
 }
 
 
 TARGET_TEST_F(SchedulerTest, BranchHintTrue) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* tv = graph()->NewNode(common()->Int32Constant(6));
   Node* fv = graph()->NewNode(common()->Int32Constant(7));
   Node* br = graph()->NewNode(common()->Branch(BranchHint::kTrue), p0, start);
   Node* t = graph()->NewNode(common()->IfTrue(), br);
   Node* f = graph()->NewNode(common()->IfFalse(), br);
   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);
 
   graph()->SetEnd(end);
 
-  Schedule* schedule = ComputeAndVerifySchedule(13, graph());
+  Schedule* schedule = ComputeAndVerifySchedule(13);
   // Make sure the false block is marked as deferred.
-  CHECK(!schedule->block(t)->deferred());
-  CHECK(schedule->block(f)->deferred());
+  EXPECT_FALSE(schedule->block(t)->deferred());
+  EXPECT_TRUE(schedule->block(f)->deferred());
 }
 
 
 TARGET_TEST_F(SchedulerTest, BranchHintFalse) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* tv = graph()->NewNode(common()->Int32Constant(6));
   Node* fv = graph()->NewNode(common()->Int32Constant(7));
   Node* br = graph()->NewNode(common()->Branch(BranchHint::kFalse), p0, start);
   Node* t = graph()->NewNode(common()->IfTrue(), br);
   Node* f = graph()->NewNode(common()->IfFalse(), br);
   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);
 
   graph()->SetEnd(end);
 
-  Schedule* schedule = ComputeAndVerifySchedule(13, graph());
+  Schedule* schedule = ComputeAndVerifySchedule(13);
   // Make sure the true block is marked as deferred.
-  CHECK(schedule->block(t)->deferred());
-  CHECK(!schedule->block(f)->deferred());
+  EXPECT_TRUE(schedule->block(t)->deferred());
+  EXPECT_FALSE(schedule->block(f)->deferred());
 }
 
 
 TARGET_TEST_F(SchedulerTest, Switch) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* sw = graph()->NewNode(common()->Switch(3), p0, start);
   Node* c0 = graph()->NewNode(common()->IfValue(0), sw);
   Node* v0 = graph()->NewNode(common()->Int32Constant(11));
   Node* c1 = graph()->NewNode(common()->IfValue(1), sw);
   Node* v1 = graph()->NewNode(common()->Int32Constant(22));
   Node* d = graph()->NewNode(common()->IfDefault(), sw);
   Node* vd = graph()->NewNode(common()->Int32Constant(33));
   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);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(16, graph());
+  ComputeAndVerifySchedule(16);
 }
 
 
 TARGET_TEST_F(SchedulerTest, FloatingSwitch) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* sw = graph()->NewNode(common()->Switch(3), p0, start);
   Node* c0 = graph()->NewNode(common()->IfValue(0), sw);
   Node* v0 = graph()->NewNode(common()->Int32Constant(11));
   Node* c1 = graph()->NewNode(common()->IfValue(1), sw);
   Node* v1 = graph()->NewNode(common()->Int32Constant(22));
   Node* d = graph()->NewNode(common()->IfDefault(), sw);
   Node* vd = graph()->NewNode(common()->Int32Constant(33));
   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);
 
   graph()->SetEnd(end);
 
-  ComputeAndVerifySchedule(16, graph());
+  ComputeAndVerifySchedule(16);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8