Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index de08bd1c3ee154c1cb94e5e3e89c3f12a51ef2da..ffbeff5e4d771a60bdfc83e4e74c75a227e98a9a 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -2245,22 +2245,25 @@ void FullCodeGenerator::EmitCreateIteratorResult(bool done) { |
Label gc_required; |
Label allocated; |
- Handle<Map> map(isolate()->native_context()->iterator_result_map()); |
+ const int instance_size = 5 * kPointerSize; |
+ DCHECK_EQ(isolate()->native_context()->iterator_result_map()->instance_size(), |
+ instance_size); |
- __ Allocate(map->instance_size(), eax, ecx, edx, &gc_required, TAG_OBJECT); |
+ __ Allocate(instance_size, eax, ecx, edx, &gc_required, TAG_OBJECT); |
__ jmp(&allocated); |
__ bind(&gc_required); |
- __ Push(Smi::FromInt(map->instance_size())); |
+ __ Push(Smi::FromInt(instance_size)); |
__ CallRuntime(Runtime::kAllocateInNewSpace, 1); |
__ mov(context_register(), |
Operand(ebp, StandardFrameConstants::kContextOffset)); |
__ bind(&allocated); |
- __ mov(ebx, map); |
+ __ mov(ebx, Operand(esi, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
+ __ mov(ebx, FieldOperand(ebx, GlobalObject::kNativeContextOffset)); |
+ __ mov(ebx, ContextOperand(ebx, Context::ITERATOR_RESULT_MAP_INDEX)); |
__ pop(ecx); |
__ mov(edx, isolate()->factory()->ToBoolean(done)); |
- DCHECK_EQ(map->instance_size(), 5 * kPointerSize); |
__ mov(FieldOperand(eax, HeapObject::kMapOffset), ebx); |
__ mov(FieldOperand(eax, JSObject::kPropertiesOffset), |
isolate()->factory()->empty_fixed_array()); |