Index: src/mips64/full-codegen-mips64.cc |
diff --git a/src/mips64/full-codegen-mips64.cc b/src/mips64/full-codegen-mips64.cc |
index 746119d04b6e4fd197b7201d0c4645a9c211ef1d..06c3bb45b5c400d7a72a118a69632833e8e21e31 100644 |
--- a/src/mips64/full-codegen-mips64.cc |
+++ b/src/mips64/full-codegen-mips64.cc |
@@ -2305,23 +2305,26 @@ 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(), v0, a2, a3, &gc_required, TAG_OBJECT); |
+ __ Allocate(instance_size, v0, a2, a3, &gc_required, TAG_OBJECT); |
__ jmp(&allocated); |
__ bind(&gc_required); |
- __ Push(Smi::FromInt(map->instance_size())); |
+ __ Push(Smi::FromInt(instance_size)); |
__ CallRuntime(Runtime::kAllocateInNewSpace, 1); |
__ ld(context_register(), |
MemOperand(fp, StandardFrameConstants::kContextOffset)); |
__ bind(&allocated); |
- __ li(a1, Operand(map)); |
+ __ ld(a1, ContextOperand(cp, Context::GLOBAL_OBJECT_INDEX)); |
+ __ ld(a1, FieldMemOperand(a1, GlobalObject::kNativeContextOffset)); |
+ __ ld(a1, ContextOperand(a1, Context::ITERATOR_RESULT_MAP_INDEX)); |
__ pop(a2); |
__ li(a3, Operand(isolate()->factory()->ToBoolean(done))); |
__ li(a4, Operand(isolate()->factory()->empty_fixed_array())); |
- DCHECK_EQ(map->instance_size(), 5 * kPointerSize); |
__ sd(a1, FieldMemOperand(v0, HeapObject::kMapOffset)); |
__ sd(a4, FieldMemOperand(v0, JSObject::kPropertiesOffset)); |
__ sd(a4, FieldMemOperand(v0, JSObject::kElementsOffset)); |