| Index: src/full-codegen/s390/full-codegen-s390.cc
|
| diff --git a/src/full-codegen/s390/full-codegen-s390.cc b/src/full-codegen/s390/full-codegen-s390.cc
|
| index 18e09a9af849ebb26bb9aa3723536565148c1376..80996221600e3dab001ba53e7ba9980ad1871165 100644
|
| --- a/src/full-codegen/s390/full-codegen-s390.cc
|
| +++ b/src/full-codegen/s390/full-codegen-s390.cc
|
| @@ -1130,29 +1130,10 @@ void FullCodeGenerator::EmitLoadGlobalCheckExtensions(VariableProxy* proxy,
|
| }
|
| // If no outer scope calls eval, we do not need to check more
|
| // context extensions.
|
| - if (!s->outer_scope_calls_sloppy_eval() || s->is_eval_scope()) break;
|
| + if (!s->outer_scope_calls_sloppy_eval()) break;
|
| s = s->outer_scope();
|
| }
|
|
|
| - if (s->is_eval_scope()) {
|
| - Label loop, fast;
|
| - if (!current.is(next)) {
|
| - __ Move(next, current);
|
| - }
|
| - __ bind(&loop);
|
| - // Terminate at native context.
|
| - __ LoadP(temp, FieldMemOperand(next, HeapObject::kMapOffset));
|
| - __ CompareRoot(temp, Heap::kNativeContextMapRootIndex);
|
| - __ beq(&fast, Label::kNear);
|
| - // Check that extension is "the hole".
|
| - __ LoadP(temp, ContextMemOperand(next, Context::EXTENSION_INDEX));
|
| - __ JumpIfNotRoot(temp, Heap::kTheHoleValueRootIndex, slow);
|
| - // Load next context in chain.
|
| - __ LoadP(next, ContextMemOperand(next, Context::PREVIOUS_INDEX));
|
| - __ b(&loop);
|
| - __ bind(&fast);
|
| - }
|
| -
|
| // All extension objects were empty and it is safe to use a normal global
|
| // load machinery.
|
| EmitGlobalVariableLoad(proxy, typeof_mode);
|
|
|