Fix scheduler for floating non-naked non-empty loops.

test/cctest/compiler/test-scheduler.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/generic-node-inl.h"
 #include "src/compiler/generic-node.h"
@@ skipping 1807 matching lines @@
   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);
 
   Node* loop = graph.NewNode(common.Loop(2), f, start);
   Node* ind = graph.NewNode(common.Phi(kMachAnyTagged, 2), p0, p0, loop);
 
-  // TODO(mstarzinger): Make scheduler deal with non-empty loops here.
-  // Node* add = graph.NewNode(&kIntAdd, ind, fv);
-
-  Node* br1 = graph.NewNode(common.Branch(), ind, loop);
+  Node* add = graph.NewNode(&kIntAdd, ind, fv);
+  Node* br1 = graph.NewNode(common.Branch(), add, loop);
   Node* t1 = graph.NewNode(common.IfTrue(), br1);
   Node* f1 = graph.NewNode(common.IfFalse(), br1);
 
   loop->ReplaceInput(1, t1);  // close loop.
   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(19, &graph);
+  ComputeAndVerifySchedule(20, &graph);
 }
 
 
 TEST(LoopedFloatingDiamond1) {
   HandleAndZoneScope scope;
   Graph graph(scope.main_zone());
   CommonOperatorBuilder common(scope.main_zone());
   SimplifiedOperatorBuilder simplified(scope.main_zone());
 
   Node* start = graph.NewNode(common.Start(2));
@@ skipping 181 matching lines @@
   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