Index: runtime/vm/intrinsifier_ia32.cc |
diff --git a/runtime/vm/intrinsifier_ia32.cc b/runtime/vm/intrinsifier_ia32.cc |
index 16d5209cef3d0d6a3396ef7951b617c9cd65c62f..61a300436687280237876375b6ea92c236fd2e49 100644 |
--- a/runtime/vm/intrinsifier_ia32.cc |
+++ b/runtime/vm/intrinsifier_ia32.cc |
@@ -216,9 +216,8 @@ void Intrinsifier::GrowableArray_add(Assembler* assembler) { |
sizeof(Raw##type_name) + kObjectAlignment - 1; \ |
__ leal(EDI, Address(EDI, scale_factor, fixed_size_plus_alignment_padding)); \ |
__ andl(EDI, Immediate(-kObjectAlignment)); \ |
- Heap::Space space = Heap::kNew; \ |
- __ movl(ECX, Address(THR, Thread::heap_offset())); \ |
- __ movl(EAX, Address(ECX, Heap::TopOffset(space))); \ |
+ NOT_IN_PRODUCT(Heap::Space space = Heap::kNew); \ |
+ __ movl(EAX, Address(THR, Thread::top_offset())); \ |
__ movl(EBX, EAX); \ |
\ |
/* EDI: allocation size. */ \ |
@@ -230,12 +229,12 @@ void Intrinsifier::GrowableArray_add(Assembler* assembler) { |
/* EBX: potential next object start. */ \ |
/* EDI: allocation size. */ \ |
/* ECX: heap. */ \ |
- __ cmpl(EBX, Address(ECX, Heap::EndOffset(space))); \ |
+ __ cmpl(EBX, Address(THR, Thread::end_offset())); \ |
__ j(ABOVE_EQUAL, &fall_through); \ |
\ |
/* Successfully allocated the object(s), now update top to point to */ \ |
/* next object start and initialize the object. */ \ |
- __ movl(Address(ECX, Heap::TopOffset(space)), EBX); \ |
+ __ movl(Address(THR, Thread::top_offset()), EBX); \ |
__ addl(EAX, Immediate(kHeapObjectTag)); \ |
NOT_IN_PRODUCT(__ UpdateAllocationStatsWithSize(cid, EDI, ECX, space)); \ |
\ |
@@ -2036,8 +2035,7 @@ static void TryAllocateOnebyteString(Assembler* assembler, |
const intptr_t cid = kOneByteStringCid; |
Heap::Space space = Heap::kNew; |
- __ movl(ECX, Address(THR, Thread::heap_offset())); |
- __ movl(EAX, Address(ECX, Heap::TopOffset(space))); |
+ __ movl(EAX, Address(THR, Thread::top_offset())); |
__ movl(EBX, EAX); |
// EDI: allocation size. |
@@ -2049,12 +2047,12 @@ static void TryAllocateOnebyteString(Assembler* assembler, |
// EBX: potential next object start. |
// EDI: allocation size. |
// ECX: heap. |
- __ cmpl(EBX, Address(ECX, Heap::EndOffset(space))); |
+ __ cmpl(EBX, Address(THR, Thread::end_offset())); |
__ j(ABOVE_EQUAL, &pop_and_fail); |
// Successfully allocated the object(s), now update top to point to |
// next object start and initialize the object. |
- __ movl(Address(ECX, Heap::TopOffset(space)), EBX); |
+ __ movl(Address(THR, Thread::top_offset()), EBX); |
__ addl(EAX, Immediate(kHeapObjectTag)); |
NOT_IN_PRODUCT(__ UpdateAllocationStatsWithSize(cid, EDI, ECX, space)); |