Chromium Code Reviews| Index: runtime/vm/stub_code_ia32.cc |
| diff --git a/runtime/vm/stub_code_ia32.cc b/runtime/vm/stub_code_ia32.cc |
| index 77a8471e17144b34fd959195993248c1aaa1829d..e07973d4016fea08a3f8832c2f0ed7c02ff23560 100644 |
| --- a/runtime/vm/stub_code_ia32.cc |
| +++ b/runtime/vm/stub_code_ia32.cc |
| @@ -808,6 +808,12 @@ void StubCode::GenerateAllocateContextStub(Assembler* assembler) { |
| __ leal(EBX, Address(EDX, TIMES_4, fixed_size)); |
| __ andl(EBX, Immediate(-kObjectAlignment)); |
| + __ MaybeTraceAllocation(kContextCid, |
| + EAX, |
| + &slow_case, |
| + /* near_jump = */ false, |
|
Florian Schneider
2015/08/14 11:35:09
Use Assembler::kFarJump instead.
Cutch
2015/08/14 13:54:36
Done here and elsewhere.
|
| + /* inline_isolate = */ false); |
| + |
| // Now allocate the object. |
| // EDX: number of context variables. |
| const intptr_t cid = kContextCid; |
| @@ -1020,7 +1026,7 @@ void StubCode::GenerateAllocationStubForClass( |
| // EDX: instantiated type arguments. |
| } |
| if (FLAG_inline_alloc && Heap::IsAllocatableInNewSpace(instance_size) && |
| - !cls.trace_allocation()) { |
| + !cls.TraceAllocation()) { |
| Label slow_case; |
| // Allocate the object and update top to point to |
| // next object start and initialize the allocated object. |