| Index: src/x64/stub-cache-x64.cc
|
| diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
|
| index 5c23a1d96f616895cdcd32ff3870ef541723b698..02b4bbeec15ba79fbfda6ceeef8a732bbb69b50b 100644
|
| --- a/src/x64/stub-cache-x64.cc
|
| +++ b/src/x64/stub-cache-x64.cc
|
| @@ -228,15 +228,15 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm,
|
| Register prototype) {
|
| // Load the global or builtins object from the current context.
|
| __ movq(prototype,
|
| - Operand(rsi, Context::SlotOffset(Context::GLOBAL_INDEX)));
|
| + Operand(rsi, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX)));
|
| // Load the native context from the global or builtins object.
|
| __ movq(prototype,
|
| - FieldOperand(prototype, GlobalObject::kNativeContextOffset));
|
| + FieldOperand(prototype, GlobalObject::kNativeContextOffset));
|
| // Load the function from the native context.
|
| __ movq(prototype, Operand(prototype, Context::SlotOffset(index)));
|
| // Load the initial map. The global functions all have initial maps.
|
| __ movq(prototype,
|
| - FieldOperand(prototype, JSFunction::kPrototypeOrInitialMapOffset));
|
| + FieldOperand(prototype, JSFunction::kPrototypeOrInitialMapOffset));
|
| // Load the prototype from the initial map.
|
| __ movq(prototype, FieldOperand(prototype, Map::kPrototypeOffset));
|
| }
|
| @@ -249,8 +249,8 @@ void StubCompiler::GenerateDirectLoadGlobalFunctionPrototype(
|
| Label* miss) {
|
| Isolate* isolate = masm->isolate();
|
| // Check we're still in the same context.
|
| - __ Move(prototype, isolate->global());
|
| - __ cmpq(Operand(rsi, Context::SlotOffset(Context::GLOBAL_INDEX)),
|
| + __ Move(prototype, isolate->global_object());
|
| + __ cmpq(Operand(rsi, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX)),
|
| prototype);
|
| __ j(not_equal, miss);
|
| // Get the global function with the given index.
|
|
|