| Index: test/cctest/compiler/test-loop-analysis.cc
|
| diff --git a/test/cctest/compiler/test-loop-analysis.cc b/test/cctest/compiler/test-loop-analysis.cc
|
| index 8a845217df90c2e1d4c43c726269dbecdb31a5dc..ffb08722698878001c0de6fad7e7ee4e0b94473f 100644
|
| --- a/test/cctest/compiler/test-loop-analysis.cc
|
| +++ b/test/cctest/compiler/test-loop-analysis.cc
|
| @@ -116,7 +116,8 @@ class LoopFinderTester : HandleAndZoneScope {
|
| }
|
|
|
| Node* Return(Node* val, Node* effect, Node* control) {
|
| - Node* ret = graph.NewNode(common.Return(), val, effect, control);
|
| + Node* zero = graph.NewNode(common.Int32Constant(0));
|
| + Node* ret = graph.NewNode(common.Return(), zero, val, effect, control);
|
| end->ReplaceInput(0, ret);
|
| return ret;
|
| }
|
| @@ -696,7 +697,8 @@ TEST(LaEdgeMatrix1) {
|
| Node* if_true = t.graph.NewNode(t.common.IfTrue(), branch);
|
| Node* exit = t.graph.NewNode(t.common.IfFalse(), branch);
|
| loop->ReplaceInput(1, if_true);
|
| - Node* ret = t.graph.NewNode(t.common.Return(), p3, t.start, exit);
|
| + Node* zero = t.graph.NewNode(t.common.Int32Constant(0));
|
| + Node* ret = t.graph.NewNode(t.common.Return(), zero, p3, t.start, exit);
|
| t.graph.SetEnd(ret);
|
|
|
| Node* choices[] = {p1, phi, cond};
|
| @@ -743,7 +745,9 @@ void RunEdgeMatrix2(int i) {
|
| loop2->ReplaceInput(1, if_true2);
|
| loop1->ReplaceInput(1, exit2);
|
|
|
| - Node* ret = t.graph.NewNode(t.common.Return(), phi1, t.start, exit1);
|
| + Node* zero = t.graph.NewNode(t.common.Int32Constant(0));
|
| + Node* ret =
|
| + t.graph.NewNode(t.common.Return(), zero, phi1, t.start, exit1);
|
| t.graph.SetEnd(ret);
|
|
|
| Node* choices[] = {p1, phi1, cond1, phi2, cond2};
|
| @@ -830,7 +834,8 @@ void RunEdgeMatrix3(int c1a, int c1b, int c1c, // line break
|
| loop2->ReplaceInput(1, exit3);
|
| loop1->ReplaceInput(1, exit2);
|
|
|
| - Node* ret = t.graph.NewNode(t.common.Return(), phi1, t.start, exit1);
|
| + Node* zero = t.graph.NewNode(t.common.Int32Constant(0));
|
| + Node* ret = t.graph.NewNode(t.common.Return(), zero, phi1, t.start, exit1);
|
| t.graph.SetEnd(ret);
|
|
|
| // Mutate the graph according to the edge choices.
|
| @@ -943,7 +948,8 @@ static void RunManyChainedLoops_i(int count) {
|
| last = exit;
|
| }
|
|
|
| - Node* ret = t.graph.NewNode(t.common.Return(), t.p0, t.start, last);
|
| + Node* zero = t.graph.NewNode(t.common.Int32Constant(0));
|
| + Node* ret = t.graph.NewNode(t.common.Return(), zero, t.p0, t.start, last);
|
| t.graph.SetEnd(ret);
|
|
|
| // Verify loops.
|
| @@ -962,6 +968,7 @@ static void RunManyNestedLoops_i(int count) {
|
| Node* entry = t.start;
|
|
|
| // Build loops.
|
| + Node* zero = t.graph.NewNode(t.common.Int32Constant(0));
|
| for (int i = 0; i < count; i++) {
|
| Node* loop = t.graph.NewNode(t.common.Loop(2), entry, t.start);
|
| Node* phi = t.graph.NewNode(t.common.Phi(MachineRepresentation::kWord32, 2),
|
| @@ -981,7 +988,7 @@ static void RunManyNestedLoops_i(int count) {
|
| outer->ReplaceInput(1, exit);
|
| } else {
|
| // outer loop.
|
| - Node* ret = t.graph.NewNode(t.common.Return(), t.p0, t.start, exit);
|
| + Node* ret = t.graph.NewNode(t.common.Return(), zero, t.p0, t.start, exit);
|
| t.graph.SetEnd(ret);
|
| }
|
| outer = loop;
|
|
|