Index: src/mips64/macro-assembler-mips64.cc |
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc |
index 9dfca3dfc9f08cb8daea7e7b288a28fbc7be2da1..d69572176246c08ee997a812ab91376027ee5594 100644 |
--- a/src/mips64/macro-assembler-mips64.cc |
+++ b/src/mips64/macro-assembler-mips64.cc |
@@ -4722,13 +4722,12 @@ void MacroAssembler::JumpToExternalReference(const ExternalReference& builtin, |
} |
-void MacroAssembler::InvokeBuiltin(Builtins::JavaScript id, |
- InvokeFlag flag, |
+void MacroAssembler::InvokeBuiltin(int native_context_index, InvokeFlag flag, |
const CallWrapper& call_wrapper) { |
// You can't call a builtin without a valid frame. |
DCHECK(flag == JUMP_FUNCTION || has_frame()); |
- GetBuiltinEntry(t9, id); |
+ GetBuiltinEntry(t9, native_context_index); |
if (flag == CALL_FUNCTION) { |
call_wrapper.BeforeCall(CallSize(t9)); |
Call(t9); |
@@ -4741,19 +4740,19 @@ void MacroAssembler::InvokeBuiltin(Builtins::JavaScript id, |
void MacroAssembler::GetBuiltinFunction(Register target, |
- Builtins::JavaScript id) { |
+ int native_context_index) { |
// Load the builtins object into target register. |
ld(target, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
- ld(target, FieldMemOperand(target, GlobalObject::kBuiltinsOffset)); |
+ ld(target, FieldMemOperand(target, GlobalObject::kNativeContextOffset)); |
// Load the JavaScript builtin function from the builtins object. |
- ld(target, FieldMemOperand(target, |
- JSBuiltinsObject::OffsetOfFunctionWithId(id))); |
+ ld(target, ContextOperand(target, native_context_index)); |
} |
-void MacroAssembler::GetBuiltinEntry(Register target, Builtins::JavaScript id) { |
+void MacroAssembler::GetBuiltinEntry(Register target, |
+ int native_context_index) { |
DCHECK(!target.is(a1)); |
- GetBuiltinFunction(a1, id); |
+ GetBuiltinFunction(a1, native_context_index); |
// Load the code entry point from the builtins object. |
ld(target, FieldMemOperand(a1, JSFunction::kCodeEntryOffset)); |
} |