Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 41679dec8948eff288fcee6b864a969febc421d4..47de95d50b68e40a0f3b3523cee5f45820ab15a8 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -1352,7 +1352,8 @@ void MacroAssembler::CheckAccessGlobalProxy(Register holder_reg, |
#endif |
// Load the native context of the current context. |
- int offset = Context::kHeaderSize + Context::GLOBAL_INDEX * kPointerSize; |
+ int offset = |
+ Context::kHeaderSize + Context::GLOBAL_OBJECT_INDEX * kPointerSize; |
ldr(scratch, FieldMemOperand(scratch, offset)); |
ldr(scratch, FieldMemOperand(scratch, GlobalObject::kNativeContextOffset)); |
@@ -2716,7 +2717,8 @@ void MacroAssembler::InvokeBuiltin(Builtins::JavaScript id, |
void MacroAssembler::GetBuiltinFunction(Register target, |
Builtins::JavaScript id) { |
// Load the builtins object into target register. |
- ldr(target, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); |
+ ldr(target, |
+ MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
ldr(target, FieldMemOperand(target, GlobalObject::kBuiltinsOffset)); |
// Load the JavaScript builtin function from the builtins object. |
ldr(target, FieldMemOperand(target, |
@@ -2882,7 +2884,8 @@ void MacroAssembler::LoadTransitionedArrayMapConditional( |
Register scratch, |
Label* no_map_match) { |
// Load the global or builtins object from the current context. |
- ldr(scratch, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); |
+ ldr(scratch, |
+ MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
ldr(scratch, FieldMemOperand(scratch, GlobalObject::kNativeContextOffset)); |
// Check that the function's map is the same as the expected cached map. |
@@ -2929,7 +2932,8 @@ void MacroAssembler::LoadInitialArrayMap( |
void MacroAssembler::LoadGlobalFunction(int index, Register function) { |
// Load the global or builtins object from the current context. |
- ldr(function, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); |
+ ldr(function, |
+ MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
// Load the native context from the global or builtins object. |
ldr(function, FieldMemOperand(function, |
GlobalObject::kNativeContextOffset)); |