Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index a85056252e212eb32a30839bde2e2a0af3e89b69..86c247f61a7477cd8d82f55bc84c473dc45c6a03 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -283,7 +283,8 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm, |
int index, |
Register prototype) { |
// Load the global or builtins object from the current context. |
- __ ldr(prototype, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); |
+ __ ldr(prototype, |
+ MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
// Load the native context from the global or builtins object. |
__ ldr(prototype, |
FieldMemOperand(prototype, GlobalObject::kNativeContextOffset)); |
@@ -304,8 +305,9 @@ void StubCompiler::GenerateDirectLoadGlobalFunctionPrototype( |
Label* miss) { |
Isolate* isolate = masm->isolate(); |
// Check we're still in the same context. |
- __ ldr(prototype, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); |
- __ Move(ip, isolate->global()); |
+ __ ldr(prototype, |
+ MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
+ __ Move(ip, isolate->global_object()); |
__ cmp(prototype, ip); |
__ b(ne, miss); |
// Get the global function with the given index. |