Index: src/x64/builtins-x64.cc |
diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc |
index c3aa332a757af9049c92bc4febb7b28eb721f881..0b3bab0c8fd2e1580252368f56b98f57947e3861 100644 |
--- a/src/x64/builtins-x64.cc |
+++ b/src/x64/builtins-x64.cc |
@@ -1238,7 +1238,7 @@ |
Label generic_array_code; |
// Get the InternalArray function. |
- __ LoadNativeContextSlot(Context::INTERNAL_ARRAY_FUNCTION_INDEX, rdi); |
+ __ LoadGlobalFunction(Context::INTERNAL_ARRAY_FUNCTION_INDEX, rdi); |
if (FLAG_debug_code) { |
// Initial map for the builtin InternalArray functions should be maps. |
@@ -1268,7 +1268,7 @@ |
Label generic_array_code; |
// Get the Array function. |
- __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, rdi); |
+ __ LoadGlobalFunction(Context::ARRAY_FUNCTION_INDEX, rdi); |
if (FLAG_debug_code) { |
// Initial map for the builtin Array functions should be maps. |
@@ -1785,7 +1785,7 @@ |
// Overwrite the original receiver with the (original) target. |
__ movp(args.GetReceiverOperand(), rdi); |
// Let the "call_as_function_delegate" take care of the rest. |
- __ LoadNativeContextSlot(Context::CALL_AS_FUNCTION_DELEGATE_INDEX, rdi); |
+ __ LoadGlobalFunction(Context::CALL_AS_FUNCTION_DELEGATE_INDEX, rdi); |
__ Jump(masm->isolate()->builtins()->CallFunction( |
ConvertReceiverMode::kNotNullOrUndefined), |
RelocInfo::CODE_TARGET); |
@@ -1870,7 +1870,7 @@ |
// Overwrite the original receiver with the (original) target. |
__ movp(args.GetReceiverOperand(), rdi); |
// Let the "call_as_constructor_delegate" take care of the rest. |
- __ LoadNativeContextSlot(Context::CALL_AS_CONSTRUCTOR_DELEGATE_INDEX, rdi); |
+ __ LoadGlobalFunction(Context::CALL_AS_CONSTRUCTOR_DELEGATE_INDEX, rdi); |
__ Jump(masm->isolate()->builtins()->CallFunction(), |
RelocInfo::CODE_TARGET); |
} |
@@ -1992,8 +1992,8 @@ |
__ jmp(rdx); |
__ bind(&set_global_proxy); |
- __ movp(rcx, NativeContextOperand()); |
- __ movp(rcx, ContextOperand(rcx, Context::GLOBAL_PROXY_INDEX)); |
+ __ movp(rcx, GlobalObjectOperand()); |
+ __ movp(rcx, FieldOperand(rcx, JSGlobalObject::kGlobalProxyOffset)); |
__ movp(args.GetReceiverOperand(), rcx); |
__ jmp(&valid_receiver, Label::kNear); |