Index: test/cctest/compiler/test-scheduler.cc |
diff --git a/test/cctest/compiler/test-scheduler.cc b/test/cctest/compiler/test-scheduler.cc |
index 34dfad815b3e471d54bc25b365077aa7141f8d22..bd7ffc9d1b6f5329848db3b8be2c3cb88041242f 100644 |
--- a/test/cctest/compiler/test-scheduler.cc |
+++ b/test/cctest/compiler/test-scheduler.cc |
@@ -844,7 +844,7 @@ TEST(BuildScheduleSimpleLoop) { |
op = common_builder.Return(); |
Node* n19 = graph.NewNode(op, nil, nil, nil); |
USE(n19); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n8 = graph.NewNode(op, nil, nil, nil); |
USE(n8); |
op = common_builder.Parameter(0); |
@@ -866,7 +866,7 @@ TEST(BuildScheduleSimpleLoop) { |
Node* n12 = graph.NewNode(op, nil, nil, nil, nil, nil); |
USE(n12); |
n12->ReplaceInput(0, n8); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n9 = graph.NewNode(op, nil, nil, nil); |
USE(n9); |
op = common_builder.Parameter(0); |
@@ -891,7 +891,7 @@ TEST(BuildScheduleSimpleLoop) { |
n9->ReplaceInput(2, n6); |
n12->ReplaceInput(1, n9); |
n12->ReplaceInput(2, n5); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n10 = graph.NewNode(op, nil, nil, nil); |
USE(n10); |
n10->ReplaceInput(0, n0); |
@@ -962,17 +962,17 @@ TEST(BuildScheduleComplexLoops) { |
op = common_builder.Return(); |
Node* n45 = graph.NewNode(op, nil, nil, nil); |
USE(n45); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n35 = graph.NewNode(op, nil, nil, nil); |
USE(n35); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n9 = graph.NewNode(op, nil, nil, nil); |
USE(n9); |
op = common_builder.Parameter(0); |
Node* n2 = graph.NewNode(op, n0); |
USE(n2); |
n9->ReplaceInput(0, n2); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n23 = graph.NewNode(op, nil, nil, nil); |
USE(n23); |
op = js_builder.Add(); |
@@ -990,14 +990,14 @@ TEST(BuildScheduleComplexLoops) { |
Node* n14 = graph.NewNode(op, nil, nil, nil, nil, nil); |
USE(n14); |
n14->ReplaceInput(0, n9); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n10 = graph.NewNode(op, nil, nil, nil); |
USE(n10); |
op = common_builder.Parameter(0); |
Node* n3 = graph.NewNode(op, n0); |
USE(n3); |
n10->ReplaceInput(0, n3); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n24 = graph.NewNode(op, nil, nil, nil); |
USE(n24); |
n24->ReplaceInput(0, n10); |
@@ -1025,10 +1025,10 @@ TEST(BuildScheduleComplexLoops) { |
op = js_builder.LessThan(); |
Node* n27 = graph.NewNode(op, nil, nil, nil, nil, nil); |
USE(n27); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n25 = graph.NewNode(op, nil, nil, nil); |
USE(n25); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n11 = graph.NewNode(op, nil, nil, nil); |
USE(n11); |
op = common_builder.Parameter(0); |
@@ -1065,7 +1065,7 @@ TEST(BuildScheduleComplexLoops) { |
n27->ReplaceInput(0, n25); |
n27->ReplaceInput(1, n24); |
n27->ReplaceInput(2, n6); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n26 = graph.NewNode(op, nil, nil, nil); |
USE(n26); |
n26->ReplaceInput(0, n20); |
@@ -1086,7 +1086,7 @@ TEST(BuildScheduleComplexLoops) { |
n10->ReplaceInput(2, n7); |
n14->ReplaceInput(1, n10); |
n14->ReplaceInput(2, n6); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n12 = graph.NewNode(op, nil, nil, nil); |
USE(n12); |
n12->ReplaceInput(0, n0); |
@@ -1120,7 +1120,7 @@ TEST(BuildScheduleComplexLoops) { |
Node* n39 = graph.NewNode(op, nil, nil, nil, nil, nil); |
USE(n39); |
n39->ReplaceInput(0, n35); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n36 = graph.NewNode(op, nil, nil, nil); |
USE(n36); |
n36->ReplaceInput(0, n10); |
@@ -1146,7 +1146,7 @@ TEST(BuildScheduleComplexLoops) { |
n36->ReplaceInput(2, n33); |
n39->ReplaceInput(1, n36); |
n39->ReplaceInput(2, n6); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n38 = graph.NewNode(op, nil, nil, nil); |
USE(n38); |
n38->ReplaceInput(0, n14); |
@@ -1214,14 +1214,14 @@ TEST(BuildScheduleBreakAndContinue) { |
op = js_builder.Add(); |
Node* n56 = graph.NewNode(op, nil, nil, nil, nil, nil); |
USE(n56); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n10 = graph.NewNode(op, nil, nil, nil); |
USE(n10); |
op = common_builder.Parameter(0); |
Node* n2 = graph.NewNode(op, n0); |
USE(n2); |
n10->ReplaceInput(0, n2); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n25 = graph.NewNode(op, nil, nil, nil); |
USE(n25); |
op = js_builder.Add(); |
@@ -1239,14 +1239,14 @@ TEST(BuildScheduleBreakAndContinue) { |
Node* n16 = graph.NewNode(op, nil, nil, nil, nil, nil); |
USE(n16); |
n16->ReplaceInput(0, n10); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n11 = graph.NewNode(op, nil, nil, nil); |
USE(n11); |
op = common_builder.Parameter(0); |
Node* n3 = graph.NewNode(op, n0); |
USE(n3); |
n11->ReplaceInput(0, n3); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n26 = graph.NewNode(op, nil, nil, nil); |
USE(n26); |
n26->ReplaceInput(0, n11); |
@@ -1283,23 +1283,23 @@ TEST(BuildScheduleBreakAndContinue) { |
USE(n46); |
n47->ReplaceInput(1, n46); |
n47->ReplaceInput(2, n6); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n42 = graph.NewNode(op, nil, nil, nil); |
USE(n42); |
op = js_builder.LessThan(); |
Node* n30 = graph.NewNode(op, nil, nil, nil, nil, nil); |
USE(n30); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n27 = graph.NewNode(op, nil, nil, nil); |
USE(n27); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n12 = graph.NewNode(op, nil, nil, nil); |
USE(n12); |
op = common_builder.Parameter(0); |
Node* n4 = graph.NewNode(op, n0); |
USE(n4); |
n12->ReplaceInput(0, n4); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n41 = graph.NewNode(op, nil, nil, nil); |
USE(n41); |
n41->ReplaceInput(0, n27); |
@@ -1348,17 +1348,17 @@ TEST(BuildScheduleBreakAndContinue) { |
op = js_builder.Equal(); |
Node* n37 = graph.NewNode(op, nil, nil, nil, nil, nil); |
USE(n37); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n28 = graph.NewNode(op, nil, nil, nil); |
USE(n28); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n13 = graph.NewNode(op, nil, nil, nil); |
USE(n13); |
op = common_builder.NumberConstant(0); |
Node* n7 = graph.NewNode(op); |
USE(n7); |
n13->ReplaceInput(0, n7); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n54 = graph.NewNode(op, nil, nil, nil); |
USE(n54); |
n54->ReplaceInput(0, n28); |
@@ -1409,7 +1409,7 @@ TEST(BuildScheduleBreakAndContinue) { |
n30->ReplaceInput(0, n27); |
n30->ReplaceInput(1, n26); |
n30->ReplaceInput(2, n6); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n29 = graph.NewNode(op, nil, nil, nil); |
USE(n29); |
n29->ReplaceInput(0, n22); |
@@ -1456,11 +1456,11 @@ TEST(BuildScheduleBreakAndContinue) { |
n11->ReplaceInput(2, n8); |
n16->ReplaceInput(1, n11); |
n16->ReplaceInput(2, n6); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n14 = graph.NewNode(op, nil, nil, nil); |
USE(n14); |
n14->ReplaceInput(0, n0); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n55 = graph.NewNode(op, nil, nil, nil); |
USE(n55); |
n55->ReplaceInput(0, n47); |
@@ -1533,7 +1533,7 @@ TEST(BuildScheduleSimpleLoopWithCodeMotion) { |
op = common_builder.Return(); |
Node* n21 = graph.NewNode(op, nil, nil, nil); |
USE(n21); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n9 = graph.NewNode(op, nil, nil, nil); |
USE(n9); |
op = common_builder.Parameter(0); |
@@ -1547,7 +1547,7 @@ TEST(BuildScheduleSimpleLoopWithCodeMotion) { |
op = machine_builder.Int32Add(); |
Node* n19 = graph.NewNode(op, nil, nil); |
USE(n19); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n10 = graph.NewNode(op, nil, nil, nil); |
USE(n10); |
op = common_builder.Parameter(0); |
@@ -1577,7 +1577,7 @@ TEST(BuildScheduleSimpleLoopWithCodeMotion) { |
Node* n6 = graph.NewNode(op); |
USE(n6); |
n14->ReplaceInput(2, n6); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n12 = graph.NewNode(op, nil, nil, nil); |
USE(n12); |
n12->ReplaceInput(0, n0); |
@@ -1595,7 +1595,7 @@ TEST(BuildScheduleSimpleLoopWithCodeMotion) { |
n7->ReplaceInput(1, n17); |
n10->ReplaceInput(2, n7); |
n19->ReplaceInput(0, n2); |
- op = common_builder.Phi(2); |
+ op = common_builder.Phi(kMachAnyTagged, 2); |
Node* n11 = graph.NewNode(op, nil, nil, nil); |
USE(n11); |
op = common_builder.Parameter(0); |
@@ -1640,7 +1640,7 @@ static Node* CreateDiamond(Graph* graph, CommonOperatorBuilder* common, |
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(2), tv, fv, m); |
+ Node* phi = graph->NewNode(common->Phi(kMachAnyTagged, 2), tv, fv, m); |
return phi; |
} |