Index: src/x64/stub-cache-x64.cc |
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc |
index 54939d11208b3eb6c8a524c0117ba55f27d7ba9a..8be604fb0bc07ab91ae8b30d969454ae3c3094d2 100644 |
--- a/src/x64/stub-cache-x64.cc |
+++ b/src/x64/stub-cache-x64.cc |
@@ -245,14 +245,18 @@ void StubCompiler::GenerateDirectLoadGlobalFunctionPrototype( |
Register prototype, |
Label* miss) { |
Isolate* isolate = masm->isolate(); |
- // Check we're still in the same context. |
- __ 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. |
Handle<JSFunction> function( |
JSFunction::cast(isolate->native_context()->get(index))); |
+ |
+ // Check we're still in the same context. |
+ Register scratch = prototype; |
+ const int offset = Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX); |
+ __ movp(scratch, Operand(rsi, offset)); |
+ __ movp(scratch, FieldOperand(scratch, GlobalObject::kNativeContextOffset)); |
+ __ Cmp(Operand(scratch, Context::SlotOffset(index)), function); |
+ __ j(not_equal, miss); |
+ |
// Load its initial map. The global functions all have initial maps. |
__ Move(prototype, Handle<Map>(function->initial_map())); |
// Load the prototype from the initial map. |