Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(739)

Unified Diff: src/mips64/code-stubs-mips64.cc

Issue 2770003002: Set the current context to the function's context when entering to LAP. (Closed)
Patch Set: Synced. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/mips/code-stubs-mips.cc ('k') | src/objects.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/mips64/code-stubs-mips64.cc
diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
index df041d34c5d5e8c94361bf7963dcec0a64aa5aa8..41f1cc28b95ba7ea38956c14ac9ec9e577c17d0a 100644
--- a/src/mips64/code-stubs-mips64.cc
+++ b/src/mips64/code-stubs-mips64.cc
@@ -2883,8 +2883,9 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) {
// --
// -- sp[0] : last argument
// -- ...
- // -- sp[(argc - 1)* 8] : first argument
+ // -- sp[(argc - 1) * 8] : first argument
// -- sp[argc * 8] : receiver
+ // -- sp[(argc + 1) * 8] : accessor_holder
// -----------------------------------
Register callee = a0;
@@ -2910,10 +2911,6 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) {
// Save context, callee and call data.
__ Push(context, callee, call_data);
- if (!is_lazy()) {
- // Load context from callee.
- __ Ld(context, FieldMemOperand(callee, JSFunction::kContextOffset));
- }
Register scratch = call_data;
__ LoadRoot(scratch, Heap::kUndefinedValueRootIndex);
@@ -2923,6 +2920,20 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) {
// Push isolate and holder.
__ Push(scratch, holder);
+ // Enter a new context
+ if (is_lazy()) {
+ // Load context from accessor_holder
+ Register accessor_holder = context;
+ __ Ld(accessor_holder,
+ MemOperand(sp, (FCA::kArgsLength + 1 + argc()) * kPointerSize));
+ __ Ld(scratch, FieldMemOperand(accessor_holder, HeapObject::kMapOffset));
+ __ GetMapConstructor(scratch, scratch, context, callee);
+ __ Ld(context, FieldMemOperand(scratch, JSFunction::kContextOffset));
+ } else {
+ // Load context from callee.
+ __ Ld(context, FieldMemOperand(callee, JSFunction::kContextOffset));
+ }
+
// Prepare arguments.
__ mov(scratch, sp);
@@ -2963,11 +2974,9 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) {
return_value_offset = 2 + FCA::kReturnValueOffset;
}
MemOperand return_value_operand(fp, return_value_offset * kPointerSize);
- int stack_space = 0;
- int32_t stack_space_offset = 3 * kPointerSize;
- stack_space = argc() + FCA::kArgsLength + 1;
+ const int stack_space = argc() + FCA::kArgsLength + 2;
// TODO(adamk): Why are we clobbering this immediately?
- stack_space_offset = kInvalidStackOffset;
+ const int32_t stack_space_offset = kInvalidStackOffset;
CallApiFunctionAndReturn(masm, api_function_address, thunk_ref, stack_space,
stack_space_offset, return_value_operand,
&context_restore_operand);
« no previous file with comments | « src/mips/code-stubs-mips.cc ('k') | src/objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698