| Index: test/unittests/compiler/scheduler-unittest.cc
|
| diff --git a/test/unittests/compiler/scheduler-unittest.cc b/test/unittests/compiler/scheduler-unittest.cc
|
| index 45c636b27a7e9d2b1b09679110f6d181b1c0e115..954541b721474b305f5f850bd325ebe0bb193ab4 100644
|
| --- a/test/unittests/compiler/scheduler-unittest.cc
|
| +++ b/test/unittests/compiler/scheduler-unittest.cc
|
| @@ -215,7 +215,7 @@ TEST_F(SchedulerRPOTest, EntryLoop) {
|
|
|
| TEST_F(SchedulerRPOTest, EndLoop) {
|
| Schedule schedule(zone());
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
|
| schedule.AddSuccessorForTesting(schedule.start(), loop1->header());
|
| BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
|
| CheckRPONumbers(order, 3, true);
|
| @@ -225,7 +225,7 @@ TEST_F(SchedulerRPOTest, EndLoop) {
|
|
|
| TEST_F(SchedulerRPOTest, EndLoopNested) {
|
| Schedule schedule(zone());
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
|
| schedule.AddSuccessorForTesting(schedule.start(), loop1->header());
|
| schedule.AddSuccessorForTesting(loop1->last(), schedule.start());
|
| BasicBlockVector* order = Scheduler::ComputeSpecialRPO(zone(), &schedule);
|
| @@ -406,8 +406,8 @@ TEST_F(SchedulerRPOTest, LoopNest2) {
|
| TEST_F(SchedulerRPOTest, LoopFollow1) {
|
| Schedule schedule(zone());
|
|
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
|
| - SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
|
| + base::SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
|
|
|
| BasicBlock* A = schedule.start();
|
| BasicBlock* E = schedule.end();
|
| @@ -427,8 +427,8 @@ TEST_F(SchedulerRPOTest, LoopFollow1) {
|
| TEST_F(SchedulerRPOTest, LoopFollow2) {
|
| Schedule schedule(zone());
|
|
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
|
| - SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
|
| + base::SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
|
|
|
| BasicBlock* A = schedule.start();
|
| BasicBlock* S = schedule.NewBasicBlock();
|
| @@ -451,8 +451,8 @@ 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));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| + base::SmartPointer<TestLoop> loop2(CreateLoop(&schedule, size));
|
| BasicBlock* A = schedule.start();
|
| BasicBlock* E = schedule.end();
|
|
|
| @@ -472,8 +472,8 @@ TEST_F(SchedulerRPOTest, LoopFollowN) {
|
| TEST_F(SchedulerRPOTest, NestedLoopFollow1) {
|
| Schedule schedule(zone());
|
|
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
|
| - SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
|
| + base::SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
|
|
|
| BasicBlock* A = schedule.start();
|
| BasicBlock* B = schedule.NewBasicBlock();
|
| @@ -506,7 +506,7 @@ TEST_F(SchedulerRPOTest, LoopBackedges1) {
|
| BasicBlock* A = schedule.start();
|
| BasicBlock* E = schedule.end();
|
|
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| schedule.AddSuccessorForTesting(A, loop1->header());
|
| schedule.AddSuccessorForTesting(loop1->last(), E);
|
|
|
| @@ -530,7 +530,7 @@ TEST_F(SchedulerRPOTest, LoopOutedges1) {
|
| BasicBlock* D = schedule.NewBasicBlock();
|
| BasicBlock* E = schedule.end();
|
|
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| schedule.AddSuccessorForTesting(A, loop1->header());
|
| schedule.AddSuccessorForTesting(loop1->last(), E);
|
|
|
| @@ -553,7 +553,7 @@ TEST_F(SchedulerRPOTest, LoopOutedges2) {
|
| BasicBlock* A = schedule.start();
|
| BasicBlock* E = schedule.end();
|
|
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| schedule.AddSuccessorForTesting(A, loop1->header());
|
| schedule.AddSuccessorForTesting(loop1->last(), E);
|
|
|
| @@ -576,7 +576,7 @@ TEST_F(SchedulerRPOTest, LoopOutloops1) {
|
| Schedule schedule(zone());
|
| BasicBlock* A = schedule.start();
|
| BasicBlock* E = schedule.end();
|
| - SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| + base::SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
|
| schedule.AddSuccessorForTesting(A, loop1->header());
|
| schedule.AddSuccessorForTesting(loop1->last(), E);
|
|
|
|
|