Index: src/x64/builtins-x64.cc |
diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc |
index 9117d9e1b0a05923d02dfbc727f246777501f4b5..ce8ac03a474bf9bc964fda7726b1b39dbcb09147 100644 |
--- a/src/x64/builtins-x64.cc |
+++ b/src/x64/builtins-x64.cc |
@@ -678,10 +678,9 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) { |
Immediate(InterpreterFrameConstants::kRegisterFilePointerFromFp)); |
__ movp(kInterpreterBytecodeOffsetRegister, |
Immediate(BytecodeArray::kHeaderSize - kHeapObjectTag)); |
- __ LoadRoot(kInterpreterDispatchTableRegister, |
- Heap::kInterpreterTableRootIndex); |
- __ addp(kInterpreterDispatchTableRegister, |
- Immediate(FixedArray::kHeaderSize - kHeapObjectTag)); |
+ __ Move( |
+ kInterpreterDispatchTableRegister, |
+ ExternalReference::interpreter_dispatch_table_address(masm->isolate())); |
// Dispatch to the first bytecode handler for the function. |
__ movzxbp(rbx, Operand(kInterpreterBytecodeArrayRegister, |
@@ -805,10 +804,9 @@ static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) { |
__ movp(kInterpreterRegisterFileRegister, rbp); |
__ addp(kInterpreterRegisterFileRegister, |
Immediate(InterpreterFrameConstants::kRegisterFilePointerFromFp)); |
- __ LoadRoot(kInterpreterDispatchTableRegister, |
- Heap::kInterpreterTableRootIndex); |
- __ addp(kInterpreterDispatchTableRegister, |
- Immediate(FixedArray::kHeaderSize - kHeapObjectTag)); |
+ __ Move( |
+ kInterpreterDispatchTableRegister, |
+ ExternalReference::interpreter_dispatch_table_address(masm->isolate())); |
// Get the context from the frame. |
__ movp(kContextRegister, |