Index: test/unittests/compiler/escape-analysis-unittest.cc |
diff --git a/test/unittests/compiler/escape-analysis-unittest.cc b/test/unittests/compiler/escape-analysis-unittest.cc |
index 3a233d6872f9baacebd9f5491b516ae6f90028b6..c40dbab47bd0469588c292d1a3dc8dc1d7e79544 100644 |
--- a/test/unittests/compiler/escape-analysis-unittest.cc |
+++ b/test/unittests/compiler/escape-analysis-unittest.cc |
@@ -119,8 +119,9 @@ class EscapeAnalysisTest : public TypedGraphTest { |
if (!control) { |
control = control_; |
} |
- return control_ = |
- graph()->NewNode(common()->Return(), value, effect, control); |
+ Node* zero = graph()->NewNode(common()->Int32Constant(0)); |
+ return control_ = graph()->NewNode(common()->Return(), zero, value, effect, |
+ control); |
} |
void EndGraph() { |
@@ -224,7 +225,7 @@ TEST_F(EscapeAnalysisTest, StraightNonEscape) { |
Transformation(); |
- ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 1)); |
} |
@@ -250,7 +251,7 @@ TEST_F(EscapeAnalysisTest, StraightNonEscapeNonConstStore) { |
Transformation(); |
- ASSERT_EQ(load, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(load, NodeProperties::GetValueInput(result, 1)); |
} |
@@ -272,7 +273,7 @@ TEST_F(EscapeAnalysisTest, StraightEscape) { |
Transformation(); |
- ASSERT_EQ(allocation, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(allocation, NodeProperties::GetValueInput(result, 1)); |
} |
@@ -300,7 +301,7 @@ TEST_F(EscapeAnalysisTest, StoreLoadEscape) { |
Transformation(); |
- ASSERT_EQ(finish1, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(finish1, NodeProperties::GetValueInput(result, 1)); |
} |
@@ -333,7 +334,7 @@ TEST_F(EscapeAnalysisTest, BranchNonEscape) { |
Transformation(); |
- ASSERT_EQ(replacement_phi, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(replacement_phi, NodeProperties::GetValueInput(result, 1)); |
} |
@@ -365,7 +366,7 @@ TEST_F(EscapeAnalysisTest, BranchEscapeOne) { |
Transformation(); |
- ASSERT_EQ(load, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(load, NodeProperties::GetValueInput(result, 1)); |
} |
@@ -400,7 +401,7 @@ TEST_F(EscapeAnalysisTest, BranchEscapeThroughStore) { |
Transformation(); |
- ASSERT_EQ(allocation, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(allocation, NodeProperties::GetValueInput(result, 1)); |
} |
@@ -425,7 +426,7 @@ TEST_F(EscapeAnalysisTest, DanglingLoadOrder) { |
Transformation(); |
- ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 1)); |
} |
@@ -461,7 +462,7 @@ TEST_F(EscapeAnalysisTest, DeoptReplacement) { |
Transformation(); |
- ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 1)); |
Node* object_state = NodeProperties::GetValueInput(state_values1, 0); |
ASSERT_EQ(object_state->opcode(), IrOpcode::kObjectState); |
ASSERT_EQ(1, object_state->op()->ValueInputCount()); |
@@ -501,7 +502,7 @@ TEST_F(EscapeAnalysisTest, DISABLED_DeoptReplacementIdentity) { |
Transformation(); |
- ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 0)); |
+ ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 1)); |
Node* object_state = NodeProperties::GetValueInput(state_values1, 0); |
ASSERT_EQ(object_state->opcode(), IrOpcode::kObjectState); |