Set the current context to the function's context when entering to LAP.

src/s390/code-stubs-s390.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_S390
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
@@ skipping 2820 matching lines @@
 void CallApiCallbackStub::Generate(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r2                  : callee
   //  -- r6                  : call_data
   //  -- r4                  : holder
   //  -- r3                  : api_function_address
   //  -- cp                  : context
   //  --
   //  -- sp[0]               : last argument
   //  -- ...
-  //  -- sp[(argc - 1)* 4]   : first argument
+  //  -- sp[(argc - 1) * 4]  : first argument
   //  -- sp[argc * 4]        : receiver
+  //  -- sp[(argc + 1) * 4]  : accessor_holder
   // -----------------------------------
 
   Register callee = r2;
   Register call_data = r6;
   Register holder = r4;
   Register api_function_address = r3;
   Register context = cp;
 
   typedef FunctionCallbackArguments FCA;
 
   STATIC_ASSERT(FCA::kContextSaveIndex == 6);
   STATIC_ASSERT(FCA::kCalleeIndex == 5);
   STATIC_ASSERT(FCA::kDataIndex == 4);
   STATIC_ASSERT(FCA::kReturnValueOffset == 3);
   STATIC_ASSERT(FCA::kReturnValueDefaultValueIndex == 2);
   STATIC_ASSERT(FCA::kIsolateIndex == 1);
   STATIC_ASSERT(FCA::kHolderIndex == 0);
   STATIC_ASSERT(FCA::kNewTargetIndex == 7);
   STATIC_ASSERT(FCA::kArgsLength == 8);
 
   // new target
   __ PushRoot(Heap::kUndefinedValueRootIndex);
 
   // context save
   __ push(context);
-  if (!is_lazy()) {
-    // load context from callee
-    __ LoadP(context, FieldMemOperand(callee, JSFunction::kContextOffset));
-  }
 
   // callee
   __ push(callee);
 
   // call data
   __ push(call_data);
 
+  // Enter a new context
   Register scratch = call_data;
+  if (is_lazy()) {
+    // Load context from accessor_holder
+    Register accessor_holder = context;
+    __ LoadP(accessor_holder, MemOperand(sp, (argc() + 1 + 4) * kPointerSize));
+    __ LoadP(scratch, FieldMemOperand(accessor_holder, HeapObject::kMapOffset));
+    __ GetMapConstructor(scratch, scratch, context, callee);
+    __ LoadP(context, FieldMemOperand(scratch, JSFunction::kContextOffset));
+  } else {
+    // Load context from callee
+    __ LoadP(context, FieldMemOperand(callee, JSFunction::kContextOffset));
+  }
+
   __ LoadRoot(scratch, Heap::kUndefinedValueRootIndex);
   // return value
   __ push(scratch);
   // return value default
   __ push(scratch);
   // isolate
   __ mov(scratch, Operand(ExternalReference::isolate_address(masm->isolate())));
   __ push(scratch);
   // holder
   __ push(holder);
@@ skipping 144 matching lines @@
   CallApiFunctionAndReturn(masm, api_function_address, thunk_ref,
                            kStackUnwindSpace, NULL, return_value_operand, NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390