Convert compiler cctest to unittests: SchedulerTest

test/unittests/compiler/scheduler-unittest.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/v8.h"
 
 #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/cctest/cctest.h"
+#include "test/unittests/test-utils.h"
 
 using namespace v8::internal;
 using namespace v8::internal::compiler;
 
+namespace {
+
+class SchedulerTest : public TestWithZone {
+ public:
+  SchedulerTest() {}
+};
+
 Operator kIntAdd(IrOpcode::kInt32Add, Operator::kPure, "Int32Add", 2, 0, 0, 1,
                  0, 0);
 
 // TODO(titzer): pull RPO tests out to their own file.
 static void CheckRPONumbers(BasicBlockVector* order, size_t expected,

[Michael Starzinger, 2015/01/22 16:10:36]

These static methods could be made into member methods on the test class now.
Also there seem to be two fundamental groups of tests (i.e. the RPO-tests and
the graph-based ones) and we could have two test classes for that purpose,
making that separation clear.

[danno, 2015/01/23 16:51:36]

Done.

                             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_EQ(NULL, order->at(i)->loop_end());
       CHECK_EQ(NULL, order->at(i)->loop_header());
     }
   }
 }
@@ skipping 75 matching lines @@
 
   if (FLAG_trace_turbo_scheduler) {
     OFStream os(stdout);
     os << *schedule << std::endl;
   }
   ScheduleVerifier::Run(schedule);
   CHECK_EQ(expected, GetScheduledNodeCount(schedule));
   return schedule;
 }
 
+}  // namespace
 
-TEST(RPODegenerate1) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
-
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+TEST_F(SchedulerTest, RPODegenerate1) {
+  Schedule schedule(zone());
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 1, false);
   CHECK_EQ(schedule.start(), order->at(0));
 }
 
 
-TEST(RPODegenerate2) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPODegenerate2) {
+  Schedule schedule(zone());
 
   schedule.AddGoto(schedule.start(), schedule.end());
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 2, false);
   CHECK_EQ(schedule.start(), order->at(0));
   CHECK_EQ(schedule.end(), order->at(1));
 }
 
 
-TEST(RPOLine) {
-  HandleAndZoneScope scope;
-
+TEST_F(SchedulerTest, RPOLine) {
   for (int i = 0; i < 10; i++) {
-    Schedule schedule(scope.main_zone());
+    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(scope.main_zone(), &schedule);
+    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());
       }
     }
   }
 }
 
 
-TEST(RPOSelfLoop) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOSelfLoop) {
+  Schedule schedule(zone());
   schedule.AddSuccessorForTesting(schedule.start(), schedule.start());
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 1, true);
   BasicBlock* loop[] = {schedule.start()};
   CheckLoop(order, loop, 1);
 }
 
 
-TEST(RPOEntryLoop) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOEntryLoop) {
+  Schedule schedule(zone());
   BasicBlock* body = schedule.NewBasicBlock();
   schedule.AddSuccessorForTesting(schedule.start(), body);
   schedule.AddSuccessorForTesting(body, schedule.start());
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 2, true);
   BasicBlock* loop[] = {schedule.start(), body};
   CheckLoop(order, loop, 2);
 }
 
 
-TEST(RPOEndLoop) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOEndLoop) {
+  Schedule schedule(zone());
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
   schedule.AddSuccessorForTesting(schedule.start(), loop1->header());
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 3, true);
   loop1->Check(order);
 }
 
 
-TEST(RPOEndLoopNested) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOEndLoopNested) {
+  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(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 3, true);
   loop1->Check(order);
 }
 
 
-TEST(RPODiamond) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPODiamond) {
+  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(scope.main_zone(), &schedule);
+  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());
 }
 
 
-TEST(RPOLoop1) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOLoop1) {
+  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(B, C);
   schedule.AddSuccessorForTesting(C, B);
   schedule.AddSuccessorForTesting(C, D);
 
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 4, true);
   BasicBlock* loop[] = {B, C};
   CheckLoop(order, loop, 2);
 }
 
 
-TEST(RPOLoop2) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOLoop2) {
+  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(B, C);
   schedule.AddSuccessorForTesting(C, B);
   schedule.AddSuccessorForTesting(B, D);
 
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 4, true);
   BasicBlock* loop[] = {B, C};
   CheckLoop(order, loop, 2);
 }
 
 
-TEST(RPOLoopN) {
-  HandleAndZoneScope scope;
-
+TEST_F(SchedulerTest, RPOLoopN) {
   for (int i = 0; i < 11; i++) {
-    Schedule schedule(scope.main_zone());
+    Schedule schedule(zone());
     BasicBlock* A = schedule.start();
     BasicBlock* B = schedule.NewBasicBlock();
     BasicBlock* C = schedule.NewBasicBlock();
     BasicBlock* D = schedule.NewBasicBlock();
     BasicBlock* E = schedule.NewBasicBlock();
     BasicBlock* F = schedule.NewBasicBlock();
     BasicBlock* G = schedule.end();
 
     schedule.AddSuccessorForTesting(A, B);
     schedule.AddSuccessorForTesting(B, C);
@@ skipping 10 matching lines @@
     if (i == 4) schedule.AddSuccessorForTesting(E, B);
     if (i == 5) schedule.AddSuccessorForTesting(F, B);
 
     // Throw in extra loop exits from time to time.
     if (i == 6) schedule.AddSuccessorForTesting(B, G);
     if (i == 7) schedule.AddSuccessorForTesting(C, G);
     if (i == 8) schedule.AddSuccessorForTesting(D, G);
     if (i == 9) schedule.AddSuccessorForTesting(E, G);
     if (i == 10) schedule.AddSuccessorForTesting(F, G);
 
-    BasicBlockVector* order =
-        Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+    BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
     CheckRPONumbers(order, 7, true);
     BasicBlock* loop[] = {B, C, D, E, F};
     CheckLoop(order, loop, 5);
   }
 }
 
 
-TEST(RPOLoopNest1) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOLoopNest1) {
+  Schedule schedule(zone());
 
   BasicBlock* A = schedule.start();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.NewBasicBlock();
   BasicBlock* E = schedule.NewBasicBlock();
   BasicBlock* F = schedule.end();
 
   schedule.AddSuccessorForTesting(A, B);
   schedule.AddSuccessorForTesting(B, C);
   schedule.AddSuccessorForTesting(C, D);
   schedule.AddSuccessorForTesting(D, C);
   schedule.AddSuccessorForTesting(D, E);
   schedule.AddSuccessorForTesting(E, B);
   schedule.AddSuccessorForTesting(E, F);
 
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 6, true);
   BasicBlock* loop1[] = {B, C, D, E};
   CheckLoop(order, loop1, 4);
 
   BasicBlock* loop2[] = {C, D};
   CheckLoop(order, loop2, 2);
 }
 
 
-TEST(RPOLoopNest2) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOLoopNest2) {
+  Schedule schedule(zone());
 
   BasicBlock* A = schedule.start();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.NewBasicBlock();
   BasicBlock* E = schedule.NewBasicBlock();
   BasicBlock* F = schedule.NewBasicBlock();
   BasicBlock* G = schedule.NewBasicBlock();
   BasicBlock* H = schedule.end();
 
   schedule.AddSuccessorForTesting(A, B);
   schedule.AddSuccessorForTesting(B, C);
   schedule.AddSuccessorForTesting(C, D);
   schedule.AddSuccessorForTesting(D, E);
   schedule.AddSuccessorForTesting(E, F);
   schedule.AddSuccessorForTesting(F, G);
   schedule.AddSuccessorForTesting(G, H);
 
   schedule.AddSuccessorForTesting(E, D);
   schedule.AddSuccessorForTesting(F, C);
   schedule.AddSuccessorForTesting(G, B);
 
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 8, true);
   BasicBlock* loop1[] = {B, C, D, E, F, G};
   CheckLoop(order, loop1, 6);
 
   BasicBlock* loop2[] = {C, D, E, F};
   CheckLoop(order, loop2, 4);
 
   BasicBlock* loop3[] = {D, E};
   CheckLoop(order, loop3, 2);
 }
 
 
-TEST(RPOLoopFollow1) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOLoopFollow1) {
+  Schedule schedule(zone());
 
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
   SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
 
   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(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
 
   CHECK_EQ(static_cast<int>(schedule.BasicBlockCount()),
            static_cast<int>(order->size()));
 
   loop1->Check(order);
   loop2->Check(order);
 }
 
 
-TEST(RPOLoopFollow2) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOLoopFollow2) {
+  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(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
 
   CHECK_EQ(static_cast<int>(schedule.BasicBlockCount()),
            static_cast<int>(order->size()));
   loop1->Check(order);
   loop2->Check(order);
 }
 
 
-TEST(RPOLoopFollowN) {
-  HandleAndZoneScope scope;
-
+TEST_F(SchedulerTest, RPOLoopFollowN) {
   for (int size = 1; size < 5; size++) {
     for (int exit = 0; exit < size; exit++) {
-      Schedule schedule(scope.main_zone());
+      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(scope.main_zone(), &schedule);
+      BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
 
       CHECK_EQ(static_cast<int>(schedule.BasicBlockCount()),
                static_cast<int>(order->size()));
       loop1->Check(order);
       loop2->Check(order);
     }
   }
 }
 
 
-TEST(RPONestedLoopFollow1) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPONestedLoopFollow1) {
+  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(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
 
   CHECK_EQ(static_cast<int>(schedule.BasicBlockCount()),
            static_cast<int>(order->size()));
   loop1->Check(order);
   loop2->Check(order);
 
   BasicBlock* loop3[] = {B, loop1->nodes[0], loop2->nodes[0], C};
   CheckLoop(order, loop3, 4);
 }
 
 
-TEST(RPOLoopBackedges1) {
-  HandleAndZoneScope scope;
-
+TEST_F(SchedulerTest, RPOLoopBackedges1) {
   int size = 8;
   for (int i = 0; i < size; i++) {
     for (int j = 0; j < size; j++) {
-      Schedule schedule(scope.main_zone());
+      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(scope.main_zone(), &schedule);
+      BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
       CheckRPONumbers(order, schedule.BasicBlockCount(), true);
       loop1->Check(order);
     }
   }
 }
 
 
-TEST(RPOLoopOutedges1) {
-  HandleAndZoneScope scope;
-
+TEST_F(SchedulerTest, RPOLoopOutedges1) {
   int size = 8;
   for (int i = 0; i < size; i++) {
     for (int j = 0; j < size; j++) {
-      Schedule schedule(scope.main_zone());
+      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(scope.main_zone(), &schedule);
+      BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
       CheckRPONumbers(order, schedule.BasicBlockCount(), true);
       loop1->Check(order);
     }
   }
 }
 
 
-TEST(RPOLoopOutedges2) {
-  HandleAndZoneScope scope;
-
+TEST_F(SchedulerTest, RPOLoopOutedges2) {
   int size = 8;
   for (int i = 0; i < size; i++) {
-    Schedule schedule(scope.main_zone());
+    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(scope.main_zone(), &schedule);
+    BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
     CheckRPONumbers(order, schedule.BasicBlockCount(), true);
     loop1->Check(order);
   }
 }
 
 
-TEST(RPOLoopOutloops1) {
-  HandleAndZoneScope scope;
-
+TEST_F(SchedulerTest, RPOLoopOutloops1) {
   int size = 8;
   for (int i = 0; i < size; i++) {
-    Schedule schedule(scope.main_zone());
+    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(scope.main_zone(), &schedule);
+    BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
     CheckRPONumbers(order, schedule.BasicBlockCount(), true);
     loop1->Check(order);
 
     for (int j = 0; j < size; j++) {
       loopN[j]->Check(order);
       delete loopN[j];
     }
     delete[] loopN;
   }
 }
 
 
-TEST(RPOLoopMultibackedge) {
-  HandleAndZoneScope scope;
-  Schedule schedule(scope.main_zone());
+TEST_F(SchedulerTest, RPOLoopMultibackedge) {
+  Schedule schedule(zone());
 
   BasicBlock* A = schedule.start();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.NewBasicBlock();
   BasicBlock* E = schedule.NewBasicBlock();
 
   schedule.AddSuccessorForTesting(A, B);
   schedule.AddSuccessorForTesting(B, C);
   schedule.AddSuccessorForTesting(B, D);
   schedule.AddSuccessorForTesting(B, E);
   schedule.AddSuccessorForTesting(C, B);
   schedule.AddSuccessorForTesting(D, B);
   schedule.AddSuccessorForTesting(E, B);
 
-  BasicBlockVector* order =
-      Scheduler::ComputeSpecialRPO(scope.main_zone(), &schedule);
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
   CheckRPONumbers(order, 5, true);
 
   BasicBlock* loop1[] = {B, C, D, E};
   CheckLoop(order, loop1, 4);
 }
 
 
-TEST(BuildScheduleEmpty) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder builder(scope.main_zone());
+TEST_F(SchedulerTest, BuildScheduleEmpty) {
+  Graph graph(zone());
+  CommonOperatorBuilder builder(zone());
   graph.SetStart(graph.NewNode(builder.Start(0)));
   graph.SetEnd(graph.NewNode(builder.End(), graph.start()));
 
-  USE(Scheduler::ComputeSchedule(scope.main_zone(), &graph));
+  USE(Scheduler::ComputeSchedule(zone(), &graph));
 }
 
 
-TEST(BuildScheduleOneParameter) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder builder(scope.main_zone());
+TEST_F(SchedulerTest, BuildScheduleOneParameter) {
+  Graph graph(zone());
+  CommonOperatorBuilder builder(zone());
   graph.SetStart(graph.NewNode(builder.Start(0)));
 
   Node* p1 = graph.NewNode(builder.Parameter(0), graph.start());
   Node* ret = graph.NewNode(builder.Return(), p1, graph.start(), graph.start());
 
   graph.SetEnd(graph.NewNode(builder.End(), ret));
 
-  USE(Scheduler::ComputeSchedule(scope.main_zone(), &graph));
+  USE(Scheduler::ComputeSchedule(zone(), &graph));
 }
 
 
-TEST(BuildScheduleIfSplit) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder builder(scope.main_zone());
-  JSOperatorBuilder js_builder(scope.main_zone());
+TEST_F(SchedulerTest, BuildScheduleIfSplit) {
+  Graph graph(zone());
+  CommonOperatorBuilder builder(zone());
+  JSOperatorBuilder js_builder(zone());
   graph.SetStart(graph.NewNode(builder.Start(3)));
 
   Node* p1 = graph.NewNode(builder.Parameter(0), graph.start());
   Node* p2 = graph.NewNode(builder.Parameter(1), graph.start());
   Node* p3 = graph.NewNode(builder.Parameter(2), graph.start());
   Node* p4 = graph.NewNode(builder.Parameter(3), graph.start());
   Node* p5 = graph.NewNode(builder.Parameter(4), graph.start());
   Node* cmp = graph.NewNode(js_builder.LessThanOrEqual(), p1, p2, p3,
                             graph.start(), graph.start());
   Node* branch = graph.NewNode(builder.Branch(), cmp, graph.start());
   Node* true_branch = graph.NewNode(builder.IfTrue(), branch);
   Node* false_branch = graph.NewNode(builder.IfFalse(), branch);
 
   Node* ret1 = graph.NewNode(builder.Return(), p4, graph.start(), true_branch);
   Node* ret2 = graph.NewNode(builder.Return(), p5, graph.start(), false_branch);
   Node* merge = graph.NewNode(builder.Merge(2), ret1, ret2);
   graph.SetEnd(graph.NewNode(builder.End(), merge));
 
   ComputeAndVerifySchedule(13, &graph);
 }
 
 
-TEST(BuildScheduleIfSplitWithEffects) {
-  HandleAndZoneScope scope;
-  Isolate* isolate = scope.main_isolate();
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common_builder(scope.main_zone());
-  JSOperatorBuilder js_builder(scope.main_zone());
+TEST_F(SchedulerTest, BuildScheduleIfSplitWithEffects) {
+  Graph graph(zone());
+  CommonOperatorBuilder common_builder(zone());
+  JSOperatorBuilder js_builder(zone());
   const Operator* op;
 
   Handle<HeapObject> object =

[Michael Starzinger, 2015/01/22 16:10:36]

I am not an expert on how the unit-tests should be structured, but should be
have helper methods providing these objects? Maybe Benedikt has an opinion.

[danno, 2015/01/23 16:51:36]

Done.

-      Handle<HeapObject>(isolate->heap()->undefined_value(), isolate);
+      Handle<HeapObject>(isolate()->heap()->undefined_value(), isolate());
   Unique<HeapObject> unique_constant =
       Unique<HeapObject>::CreateUninitialized(object);
 
   // 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 116 matching lines @@
   n22->ReplaceInput(1, n21);
   n23->ReplaceInput(0, n22);
 
   graph.SetStart(n0);
   graph.SetEnd(n23);
 
   ComputeAndVerifySchedule(20, &graph);
 }
 
 
-TEST(BuildScheduleSimpleLoop) {
-  HandleAndZoneScope scope;
-  Isolate* isolate = scope.main_isolate();
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common_builder(scope.main_zone());
-  JSOperatorBuilder js_builder(scope.main_zone());
+TEST_F(SchedulerTest, BuildScheduleSimpleLoop) {
+  Graph graph(zone());
+  CommonOperatorBuilder common_builder(zone());
+  JSOperatorBuilder js_builder(zone());
   const Operator* op;
 
   Handle<HeapObject> object =
-      Handle<HeapObject>(isolate->heap()->undefined_value(), isolate);
+      Handle<HeapObject>(isolate()->heap()->undefined_value(), isolate());
   Unique<HeapObject> unique_constant =
       Unique<HeapObject>::CreateUninitialized(object);
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b) {
   //   while (a < b) {
   //     a++;
   //   }
   //   return a;
   // }
@@ skipping 83 matching lines @@
   n19->ReplaceInput(2, n15);
   n20->ReplaceInput(0, n19);
 
   graph.SetStart(n0);
   graph.SetEnd(n20);
 
   ComputeAndVerifySchedule(19, &graph);
 }
 
 
-TEST(BuildScheduleComplexLoops) {
-  HandleAndZoneScope scope;
-  Isolate* isolate = scope.main_isolate();
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common_builder(scope.main_zone());
-  JSOperatorBuilder js_builder(scope.main_zone());
+TEST_F(SchedulerTest, BuildScheduleComplexLoops) {
+  Graph graph(zone());
+  CommonOperatorBuilder common_builder(zone());
+  JSOperatorBuilder js_builder(zone());
   const Operator* op;
 
   Handle<HeapObject> object =
-      Handle<HeapObject>(isolate->heap()->undefined_value(), isolate);
+      Handle<HeapObject>(isolate()->heap()->undefined_value(), isolate());
   Unique<HeapObject> unique_constant =
       Unique<HeapObject>::CreateUninitialized(object);
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b, c) {
   //   while (a < b) {
   //     a++;
   //     while (c < b) {
   //       c++;
   //     }
@@ skipping 218 matching lines @@
   n45->ReplaceInput(2, n42);
   n46->ReplaceInput(0, n45);
 
   graph.SetStart(n0);
   graph.SetEnd(n46);
 
   ComputeAndVerifySchedule(46, &graph);
 }
 
 
-TEST(BuildScheduleBreakAndContinue) {
-  HandleAndZoneScope scope;
-  Isolate* isolate = scope.main_isolate();
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common_builder(scope.main_zone());
-  JSOperatorBuilder js_builder(scope.main_zone());
+TEST_F(SchedulerTest, BuildScheduleBreakAndContinue) {
+  Graph graph(zone());
+  CommonOperatorBuilder common_builder(zone());
+  JSOperatorBuilder js_builder(zone());
   const Operator* op;
 
   Handle<HeapObject> object =
-      Handle<HeapObject>(isolate->heap()->undefined_value(), isolate);
+      Handle<HeapObject>(isolate()->heap()->undefined_value(), isolate());
   Unique<HeapObject> unique_constant =
       Unique<HeapObject>::CreateUninitialized(object);
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b, c) {
   //   var d = 0;
   //   while (a < b) {
   //     a++;
   //     while (c < b) {
   //       c++;
@@ skipping 300 matching lines @@
   n57->ReplaceInput(2, n19);
   n58->ReplaceInput(0, n57);
 
   graph.SetStart(n0);
   graph.SetEnd(n58);
 
   ComputeAndVerifySchedule(62, &graph);
 }
 
 
-TEST(BuildScheduleSimpleLoopWithCodeMotion) {
-  HandleAndZoneScope scope;
-  Isolate* isolate = scope.main_isolate();
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common_builder(scope.main_zone());
-  JSOperatorBuilder js_builder(scope.main_zone());
+TEST_F(SchedulerTest, BuildScheduleSimpleLoopWithCodeMotion) {
+  Graph graph(zone());
+  CommonOperatorBuilder common_builder(zone());
+  JSOperatorBuilder js_builder(zone());
   const Operator* op;
 
   Handle<HeapObject> object =
-      Handle<HeapObject>(isolate->heap()->undefined_value(), isolate);
+      Handle<HeapObject>(isolate()->heap()->undefined_value(), isolate());
   Unique<HeapObject> unique_constant =
       Unique<HeapObject>::CreateUninitialized(object);
 
   // Manually transcripted code for:
   // function turbo_fan_test(a, b, c) {
   //   while (a < b) {
   //     a += b + c;
   //   }
   //   return a;
   // }
@@ skipping 112 matching lines @@
   Node* fv = graph->NewNode(common->Int32Constant(7));
   Node* br = graph->NewNode(common->Branch(), cond, graph->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);
   return phi;
 }
 
 
-TEST(FloatingDiamond1) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, FloatingDiamond1) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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);
 }
 
 
-TEST(FloatingDiamond2) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, FloatingDiamond2) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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);
 }
 
 
-TEST(FloatingDiamond3) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, FloatingDiamond3) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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);
 }
 
 
-TEST(NestedFloatingDiamonds) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
-  SimplifiedOperatorBuilder simplified(scope.main_zone());
+TEST_F(SchedulerTest, NestedFloatingDiamonds) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
+  SimplifiedOperatorBuilder simplified(zone());
 
   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));
   Node* br = graph.NewNode(common.Branch(), p0, graph.start());
   Node* t = graph.NewNode(common.IfTrue(), br);
   Node* f = graph.NewNode(common.IfFalse(), br);
@@ skipping 16 matching lines @@
 
   Node* ret = graph.NewNode(common.Return(), phi, ephi1, start);
   Node* end = graph.NewNode(common.End(), ret, start);
 
   graph.SetEnd(end);
 
   ComputeAndVerifySchedule(23, &graph);
 }
 
 
-TEST(NestedFloatingDiamondWithChain) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, NestedFloatingDiamondWithChain) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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));
 
   Node* brA1 = graph.NewNode(common.Branch(), p0, graph.start());
   Node* tA1 = graph.NewNode(common.IfTrue(), brA1);
@@ skipping 22 matching lines @@
   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(35, &graph);
 }
 
 
-TEST(NestedFloatingDiamondWithLoop) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, NestedFloatingDiamondWithLoop) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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));
   Node* br = graph.NewNode(common.Branch(), p0, graph.start());
   Node* t = graph.NewNode(common.IfTrue(), br);
   Node* f = graph.NewNode(common.IfFalse(), br);
@@ skipping 14 matching lines @@
 
   Node* ret = graph.NewNode(common.Return(), phi, start, start);
   Node* end = graph.NewNode(common.End(), ret, start);
 
   graph.SetEnd(end);
 
   ComputeAndVerifySchedule(20, &graph);
 }
 
 
-TEST(LoopedFloatingDiamond1) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, LoopedFloatingDiamond1) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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));
   Node* loop = graph.NewNode(common.Loop(2), start, start);
   Node* ind = graph.NewNode(common.Phi(kMachAnyTagged, 2), p0, p0, loop);
   Node* add = graph.NewNode(&kIntAdd, ind, c);
@@ skipping 13 matching lines @@
 
   Node* ret = graph.NewNode(common.Return(), ind, start, f);
   Node* end = graph.NewNode(common.End(), ret, f);
 
   graph.SetEnd(end);
 
   ComputeAndVerifySchedule(20, &graph);
 }
 
 
-TEST(LoopedFloatingDiamond2) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, LoopedFloatingDiamond2) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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));
   Node* loop = graph.NewNode(common.Loop(2), start, start);
   Node* ind = graph.NewNode(common.Phi(kMachAnyTagged, 2), p0, p0, loop);
 
@@ skipping 14 matching lines @@
 
   Node* ret = graph.NewNode(common.Return(), ind, start, f);
   Node* end = graph.NewNode(common.End(), ret, f);
 
   graph.SetEnd(end);
 
   ComputeAndVerifySchedule(20, &graph);
 }
 
 
-TEST(LoopedFloatingDiamond3) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, LoopedFloatingDiamond3) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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));
   Node* loop = graph.NewNode(common.Loop(2), start, start);
   Node* ind = graph.NewNode(common.Phi(kMachAnyTagged, 2), p0, p0, loop);
 
@@ skipping 26 matching lines @@
 
   Node* ret = graph.NewNode(common.Return(), ind, start, f);
   Node* end = graph.NewNode(common.End(), ret, f);
 
   graph.SetEnd(end);
 
   ComputeAndVerifySchedule(28, &graph);
 }
 
 
-TEST(PhisPushedDownToDifferentBranches) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, PhisPushedDownToDifferentBranches) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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* v1 = graph.NewNode(common.Int32Constant(1));
   Node* v2 = graph.NewNode(common.Int32Constant(2));
   Node* v3 = graph.NewNode(common.Int32Constant(3));
@@ skipping 13 matching lines @@
 
   Node* ret = graph.NewNode(common.Return(), phi3, start, start);
   Node* end = graph.NewNode(common.End(), ret, start);
 
   graph.SetEnd(end);
 
   ComputeAndVerifySchedule(24, &graph);
 }
 
 
-TEST(BranchHintTrue) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, BranchHintTrue) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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);
   // Make sure the false block is marked as deferred.
   CHECK(!schedule->block(t)->deferred());
   CHECK(schedule->block(f)->deferred());
 }
 
 
-TEST(BranchHintFalse) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, BranchHintFalse) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   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);
   // Make sure the true block is marked as deferred.
   CHECK(schedule->block(t)->deferred());
   CHECK(!schedule->block(f)->deferred());
 }
 
 
-TEST(ScheduleTerminate) {
-  HandleAndZoneScope scope;
-  Graph graph(scope.main_zone());
-  CommonOperatorBuilder common(scope.main_zone());
+TEST_F(SchedulerTest, ScheduleTerminate) {
+  Graph graph(zone());
+  CommonOperatorBuilder common(zone());
 
   Node* start = graph.NewNode(common.Start(1));
   graph.SetStart(start);
 
   Node* loop = graph.NewNode(common.Loop(2), start, start);
   loop->ReplaceInput(1, loop);  // self loop, NTL.
 
   Node* effect = graph.NewNode(common.EffectPhi(1), start, loop);
   effect->ReplaceInput(0, effect);
 
   Node* terminate = graph.NewNode(common.Terminate(1), effect, loop);
   Node* end = graph.NewNode(common.End(), terminate);
 
   graph.SetEnd(end);
 
   Schedule* schedule = ComputeAndVerifySchedule(6, &graph);
   BasicBlock* block = schedule->block(loop);
   CHECK_NE(NULL, loop);
   CHECK_EQ(block, schedule->block(effect));
   CHECK_GE(block->rpo_number(), 0);
 }
 
 #endif