| Index: test/unittests/compiler/js-context-relaxation-unittest.cc
|
| diff --git a/test/unittests/compiler/js-context-relaxation-unittest.cc b/test/unittests/compiler/js-context-relaxation-unittest.cc
|
| index 12ca1212e087de0919166c97f31d351ab36c97c6..e139b781e524ad92d7789e29f73487a11989463a 100644
|
| --- a/test/unittests/compiler/js-context-relaxation-unittest.cc
|
| +++ b/test/unittests/compiler/js-context-relaxation-unittest.cc
|
| @@ -82,10 +82,10 @@ TEST_F(JSContextRelaxationTest,
|
| ShallowFrameStateChain(outer_context, CALL_MAINTAINS_NATIVE_CONTEXT);
|
| Node* const effect = graph()->start();
|
| Node* const control = graph()->start();
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state, frame_state, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_TRUE(r.Changed());
|
| EXPECT_EQ(outer_context, NodeProperties::GetContextInput(node));
|
| @@ -101,10 +101,10 @@ TEST_F(JSContextRelaxationTest,
|
| ShallowFrameStateChain(outer_context, CALL_CHANGES_NATIVE_CONTEXT);
|
| Node* const effect = graph()->start();
|
| Node* const control = graph()->start();
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state, frame_state, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_FALSE(r.Changed());
|
| EXPECT_EQ(context, NodeProperties::GetContextInput(node));
|
| @@ -120,10 +120,10 @@ TEST_F(JSContextRelaxationTest,
|
| DeepFrameStateChain(outer_context, CALL_MAINTAINS_NATIVE_CONTEXT);
|
| Node* const effect = graph()->start();
|
| Node* const control = graph()->start();
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state, frame_state, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_TRUE(r.Changed());
|
| EXPECT_EQ(outer_context, NodeProperties::GetContextInput(node));
|
| @@ -139,10 +139,10 @@ TEST_F(JSContextRelaxationTest,
|
| DeepFrameStateChain(outer_context, CALL_CHANGES_NATIVE_CONTEXT);
|
| Node* const effect = graph()->start();
|
| Node* const control = graph()->start();
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state, frame_state, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_FALSE(r.Changed());
|
| EXPECT_EQ(context, NodeProperties::GetContextInput(node));
|
| @@ -161,10 +161,10 @@ TEST_F(JSContextRelaxationTest,
|
| op, graph()->start(), graph()->start(), outer_context, effect, control);
|
| Node* const frame_state_2 =
|
| ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT);
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state_2, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state_2, frame_state_2, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_TRUE(r.Changed());
|
| EXPECT_EQ(outer_context, NodeProperties::GetContextInput(node));
|
| @@ -187,10 +187,10 @@ TEST_F(JSContextRelaxationTest,
|
| frame_state_1, effect, control);
|
| Node* const frame_state_2 =
|
| ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT);
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state_2, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state_2, frame_state_2, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_TRUE(r.Changed());
|
| EXPECT_EQ(outer_context, NodeProperties::GetContextInput(node));
|
| @@ -211,10 +211,10 @@ TEST_F(JSContextRelaxationTest,
|
| graph()->NewNode(op, graph()->start(), outer_context, effect, control);
|
| Node* const frame_state_2 =
|
| ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT);
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state_2, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state_2, frame_state_2, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_TRUE(r.Changed());
|
| EXPECT_EQ(outer_context, NodeProperties::GetContextInput(node));
|
| @@ -237,10 +237,10 @@ TEST_F(JSContextRelaxationTest,
|
| frame_state_1, effect, control);
|
| Node* const frame_state_2 =
|
| ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT);
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state_2, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state_2, frame_state_2, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_TRUE(r.Changed());
|
| EXPECT_EQ(nested_context, NodeProperties::GetContextInput(node));
|
| @@ -260,10 +260,10 @@ TEST_F(JSContextRelaxationTest,
|
| op, graph()->start(), graph()->start(), outer_context, effect, control);
|
| Node* const frame_state_2 =
|
| ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT);
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state_2, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state_2, frame_state_2, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_TRUE(r.Changed());
|
| EXPECT_EQ(nested_context, NodeProperties::GetContextInput(node));
|
| @@ -283,10 +283,10 @@ TEST_F(JSContextRelaxationTest,
|
| graph()->NewNode(op, graph()->start(), outer_context, effect, control);
|
| Node* const frame_state_2 =
|
| ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT);
|
| - Node* node =
|
| - graph()->NewNode(javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS,
|
| - STRICT, VectorSlotPair()),
|
| - input0, input1, context, frame_state_2, effect, control);
|
| + Node* node = graph()->NewNode(
|
| + javascript()->CallFunction(2, NO_CALL_FUNCTION_FLAGS, STRICT,
|
| + VectorSlotPair()),
|
| + input0, input1, context, frame_state_2, frame_state_2, effect, control);
|
| Reduction const r = Reduce(node);
|
| EXPECT_FALSE(r.Changed());
|
| EXPECT_EQ(context, NodeProperties::GetContextInput(node));
|
|
|