Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index d22cbe197c690a0708ff2d1a68e25edcd50e6924..84605ac8a2437e4dd5bc380f65f7b1f3a1113274 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -80,10 +80,10 @@ void FastNewClosureStub::Generate(MacroAssembler* masm) { |
? Context::FUNCTION_MAP_INDEX |
: Context::STRICT_MODE_FUNCTION_MAP_INDEX; |
- // Compute the function map in the current global context and set that |
+ // Compute the function map in the current native context and set that |
// as the map of the allocated object. |
__ mov(ecx, Operand(esi, Context::SlotOffset(Context::GLOBAL_INDEX))); |
- __ mov(ecx, FieldOperand(ecx, GlobalObject::kGlobalContextOffset)); |
+ __ mov(ecx, FieldOperand(ecx, GlobalObject::kNativeContextOffset)); |
__ mov(ebx, Operand(ecx, Context::SlotOffset(map_index))); |
__ mov(FieldOperand(eax, JSObject::kMapOffset), ebx); |
@@ -123,8 +123,8 @@ void FastNewClosureStub::Generate(MacroAssembler* masm) { |
__ IncrementCounter(counters->fast_new_closure_try_optimized(), 1); |
- // ecx holds global context, ebx points to fixed array of 3-element entries |
- // (global context, optimized code, literals). |
+ // ecx holds native context, ebx points to fixed array of 3-element entries |
+ // (native context, optimized code, literals). |
// Map must never be empty, so check the first elements. |
Label install_optimized; |
// Speculatively move code object into edx. |
@@ -261,9 +261,9 @@ void FastNewBlockContextStub::Generate(MacroAssembler* masm) { |
__ mov(FieldOperand(eax, Context::kLengthOffset), |
Immediate(Smi::FromInt(length))); |
- // If this block context is nested in the global context we get a smi |
+ // If this block context is nested in the native context we get a smi |
// sentinel instead of a function. The block context should get the |
- // canonical empty function of the global context as its closure which |
+ // canonical empty function of the native context as its closure which |
// we still have to look up. |
Label after_sentinel; |
__ JumpIfNotSmi(ecx, &after_sentinel, Label::kNear); |
@@ -273,7 +273,7 @@ void FastNewBlockContextStub::Generate(MacroAssembler* masm) { |
__ Assert(equal, message); |
} |
__ mov(ecx, GlobalObjectOperand()); |
- __ mov(ecx, FieldOperand(ecx, GlobalObject::kGlobalContextOffset)); |
+ __ mov(ecx, FieldOperand(ecx, GlobalObject::kNativeContextOffset)); |
__ mov(ecx, ContextOperand(ecx, Context::CLOSURE_INDEX)); |
__ bind(&after_sentinel); |
@@ -3437,7 +3437,7 @@ void ArgumentsAccessStub::GenerateNewNonStrictFast(MacroAssembler* masm) { |
// Get the arguments boilerplate from the current (global) context into edi. |
Label has_mapped_parameters, copy; |
__ mov(edi, Operand(esi, Context::SlotOffset(Context::GLOBAL_INDEX))); |
- __ mov(edi, FieldOperand(edi, GlobalObject::kGlobalContextOffset)); |
+ __ mov(edi, FieldOperand(edi, GlobalObject::kNativeContextOffset)); |
__ mov(ebx, Operand(esp, 0 * kPointerSize)); |
__ test(ebx, ebx); |
__ j(not_zero, &has_mapped_parameters, Label::kNear); |
@@ -3629,7 +3629,7 @@ void ArgumentsAccessStub::GenerateNewStrict(MacroAssembler* masm) { |
// Get the arguments boilerplate from the current (global) context. |
__ mov(edi, Operand(esi, Context::SlotOffset(Context::GLOBAL_INDEX))); |
- __ mov(edi, FieldOperand(edi, GlobalObject::kGlobalContextOffset)); |
+ __ mov(edi, FieldOperand(edi, GlobalObject::kNativeContextOffset)); |
const int offset = |
Context::SlotOffset(Context::STRICT_MODE_ARGUMENTS_BOILERPLATE_INDEX); |
__ mov(edi, Operand(edi, offset)); |
@@ -4146,7 +4146,7 @@ void RegExpConstructResultStub::Generate(MacroAssembler* masm) { |
Factory* factory = masm->isolate()->factory(); |
__ mov(ecx, Immediate(factory->empty_fixed_array())); |
__ lea(ebx, Operand(eax, JSRegExpResult::kSize)); |
- __ mov(edx, FieldOperand(edx, GlobalObject::kGlobalContextOffset)); |
+ __ mov(edx, FieldOperand(edx, GlobalObject::kNativeContextOffset)); |
__ mov(FieldOperand(eax, JSObject::kElementsOffset), ebx); |
__ mov(FieldOperand(eax, JSObject::kPropertiesOffset), ecx); |
__ mov(edx, ContextOperand(edx, Context::REGEXP_RESULT_MAP_INDEX)); |