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 c0cdeb383cbba04f7b2ca63b3af3ae64b5a69537..db3435fd8f11b3f20e228eaffea888d3ac5d50f0 100644 |
--- a/test/unittests/compiler/js-context-relaxation-unittest.cc |
+++ b/test/unittests/compiler/js-context-relaxation-unittest.cc |
@@ -153,10 +153,13 @@ |
Node* const context = Parameter(2); |
Node* const outer_context = Parameter(3); |
const Operator* op = javascript()->CreateCatchContext(Handle<String>()); |
- Node* const effect = graph()->start(); |
- Node* const control = graph()->start(); |
- Node* nested_context = graph()->NewNode( |
- op, graph()->start(), graph()->start(), outer_context, effect, control); |
+ Node* const frame_state_1 = |
+ ShallowFrameStateChain(outer_context, CALL_MAINTAINS_NATIVE_CONTEXT); |
+ Node* const effect = graph()->start(); |
+ Node* const control = graph()->start(); |
+ Node* nested_context = |
+ graph()->NewNode(op, graph()->start(), graph()->start(), outer_context, |
+ frame_state_1, effect, control); |
Node* const frame_state_2 = |
ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT); |
Node* node = |
@@ -202,10 +205,13 @@ |
Node* const context = Parameter(2); |
Node* const outer_context = Parameter(3); |
const Operator* op = javascript()->CreateBlockContext(); |
- Node* const effect = graph()->start(); |
- Node* const control = graph()->start(); |
- Node* nested_context = graph()->NewNode( |
- op, graph()->start(), graph()->start(), outer_context, effect, control); |
+ Node* const frame_state_1 = |
+ ShallowFrameStateChain(outer_context, CALL_MAINTAINS_NATIVE_CONTEXT); |
+ Node* const effect = graph()->start(); |
+ Node* const control = graph()->start(); |
+ Node* nested_context = |
+ graph()->NewNode(op, graph()->start(), graph()->start(), outer_context, |
+ frame_state_1, effect, control); |
Node* const frame_state_2 = |
ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT); |
Node* node = |
@@ -251,10 +257,13 @@ |
Node* const context = Parameter(2); |
Node* const outer_context = Parameter(3); |
const Operator* op = javascript()->CreateModuleContext(); |
- Node* const effect = graph()->start(); |
- Node* const control = graph()->start(); |
- Node* nested_context = graph()->NewNode( |
- op, graph()->start(), graph()->start(), outer_context, effect, control); |
+ Node* const frame_state_1 = |
+ ShallowFrameStateChain(outer_context, CALL_MAINTAINS_NATIVE_CONTEXT); |
+ Node* const effect = graph()->start(); |
+ Node* const control = graph()->start(); |
+ Node* nested_context = |
+ graph()->NewNode(op, graph()->start(), graph()->start(), outer_context, |
+ frame_state_1, effect, control); |
Node* const frame_state_2 = |
ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT); |
Node* node = |
@@ -274,10 +283,13 @@ |
Node* const context = Parameter(2); |
Node* const outer_context = Parameter(3); |
const Operator* op = javascript()->CreateFunctionContext(); |
- Node* const effect = graph()->start(); |
- Node* const control = graph()->start(); |
- Node* nested_context = |
- graph()->NewNode(op, graph()->start(), outer_context, effect, control); |
+ Node* const frame_state_1 = |
+ ShallowFrameStateChain(outer_context, CALL_MAINTAINS_NATIVE_CONTEXT); |
+ Node* const effect = graph()->start(); |
+ Node* const control = graph()->start(); |
+ Node* nested_context = |
+ graph()->NewNode(op, graph()->start(), graph()->start(), outer_context, |
+ frame_state_1, effect, control); |
Node* const frame_state_2 = |
ShallowFrameStateChain(nested_context, CALL_MAINTAINS_NATIVE_CONTEXT); |
Node* node = |