Index: src/arm/builtins-arm.cc |
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc |
index 2d1d7b1199712556880ac857eec03ab7facc2aa6..2079e044affb9abf872015ae8cd609bdfdffc6ef 100644 |
--- a/src/arm/builtins-arm.cc |
+++ b/src/arm/builtins-arm.cc |
@@ -75,13 +75,12 @@ void Builtins::Generate_Adaptor(MacroAssembler* masm, |
// Load the built-in InternalArray function from the current context. |
static void GenerateLoadInternalArrayFunction(MacroAssembler* masm, |
Register result) { |
- // Load the native context. |
+ // Load the global context. |
+ __ ldr(result, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); |
__ ldr(result, |
- MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
- __ ldr(result, |
- FieldMemOperand(result, GlobalObject::kNativeContextOffset)); |
- // Load the InternalArray function from the native context. |
+ FieldMemOperand(result, GlobalObject::kGlobalContextOffset)); |
+ // Load the InternalArray function from the global context. |
__ ldr(result, |
MemOperand(result, |
Context::SlotOffset( |
@@ -91,13 +90,12 @@ static void GenerateLoadInternalArrayFunction(MacroAssembler* masm, |
// Load the built-in Array function from the current context. |
static void GenerateLoadArrayFunction(MacroAssembler* masm, Register result) { |
- // Load the native context. |
+ // Load the global context. |
+ __ ldr(result, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); |
__ ldr(result, |
- MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
- __ ldr(result, |
- FieldMemOperand(result, GlobalObject::kNativeContextOffset)); |
- // Load the Array function from the native context. |
+ FieldMemOperand(result, GlobalObject::kGlobalContextOffset)); |
+ // Load the Array function from the global context. |
__ ldr(result, |
MemOperand(result, |
Context::SlotOffset(Context::ARRAY_FUNCTION_INDEX))); |
@@ -1405,9 +1403,9 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) { |
// receiver. |
__ bind(&use_global_receiver); |
const int kGlobalIndex = |
- Context::kHeaderSize + Context::GLOBAL_OBJECT_INDEX * kPointerSize; |
+ Context::kHeaderSize + Context::GLOBAL_INDEX * kPointerSize; |
__ ldr(r2, FieldMemOperand(cp, kGlobalIndex)); |
- __ ldr(r2, FieldMemOperand(r2, GlobalObject::kNativeContextOffset)); |
+ __ ldr(r2, FieldMemOperand(r2, GlobalObject::kGlobalContextOffset)); |
__ ldr(r2, FieldMemOperand(r2, kGlobalIndex)); |
__ ldr(r2, FieldMemOperand(r2, GlobalObject::kGlobalReceiverOffset)); |
@@ -1600,9 +1598,9 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) { |
// Use the current global receiver object as the receiver. |
__ bind(&use_global_receiver); |
const int kGlobalOffset = |
- Context::kHeaderSize + Context::GLOBAL_OBJECT_INDEX * kPointerSize; |
+ Context::kHeaderSize + Context::GLOBAL_INDEX * kPointerSize; |
__ ldr(r0, FieldMemOperand(cp, kGlobalOffset)); |
- __ ldr(r0, FieldMemOperand(r0, GlobalObject::kNativeContextOffset)); |
+ __ ldr(r0, FieldMemOperand(r0, GlobalObject::kGlobalContextOffset)); |
__ ldr(r0, FieldMemOperand(r0, kGlobalOffset)); |
__ ldr(r0, FieldMemOperand(r0, GlobalObject::kGlobalReceiverOffset)); |