Index: src/mips64/builtins-mips64.cc |
diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc |
index a31df8fe7d94f6594b1c5bab92b8ccc1568938c2..6033b60685e1272a623cf05c504fce09e65988e0 100644 |
--- a/src/mips64/builtins-mips64.cc |
+++ b/src/mips64/builtins-mips64.cc |
@@ -71,15 +71,30 @@ |
// Load the built-in InternalArray function from the current context. |
static void GenerateLoadInternalArrayFunction(MacroAssembler* masm, |
Register result) { |
+ // Load the native context. |
+ |
+ __ ld(result, |
+ MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
+ __ ld(result, FieldMemOperand(result, JSGlobalObject::kNativeContextOffset)); |
// Load the InternalArray function from the native context. |
- __ LoadNativeContextSlot(Context::INTERNAL_ARRAY_FUNCTION_INDEX, result); |
+ __ ld(result, |
+ MemOperand(result, |
+ Context::SlotOffset( |
+ Context::INTERNAL_ARRAY_FUNCTION_INDEX))); |
} |
// Load the built-in Array function from the current context. |
static void GenerateLoadArrayFunction(MacroAssembler* masm, Register result) { |
+ // Load the native context. |
+ |
+ __ ld(result, |
+ MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
+ __ ld(result, FieldMemOperand(result, JSGlobalObject::kNativeContextOffset)); |
// Load the Array function from the native context. |
- __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, result); |
+ __ ld(result, |
+ MemOperand(result, |
+ Context::SlotOffset(Context::ARRAY_FUNCTION_INDEX))); |
} |
@@ -1728,7 +1743,7 @@ |
__ daddu(at, sp, at); |
__ sd(a1, MemOperand(at)); |
// Let the "call_as_function_delegate" take care of the rest. |
- __ LoadNativeContextSlot(Context::CALL_AS_FUNCTION_DELEGATE_INDEX, a1); |
+ __ LoadGlobalFunction(Context::CALL_AS_FUNCTION_DELEGATE_INDEX, a1); |
__ Jump(masm->isolate()->builtins()->CallFunction( |
ConvertReceiverMode::kNotNullOrUndefined), |
RelocInfo::CODE_TARGET); |
@@ -1813,7 +1828,7 @@ |
__ daddu(at, sp, at); |
__ sd(a1, MemOperand(at)); |
// Let the "call_as_constructor_delegate" take care of the rest. |
- __ LoadNativeContextSlot(Context::CALL_AS_CONSTRUCTOR_DELEGATE_INDEX, a1); |
+ __ LoadGlobalFunction(Context::CALL_AS_CONSTRUCTOR_DELEGATE_INDEX, a1); |
__ Jump(masm->isolate()->builtins()->CallFunction(), |
RelocInfo::CODE_TARGET); |
} |