Chromium Code Reviews| Index: src/ia32/lithium-codegen-ia32.cc |
| diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
| index 18c95cc65b93480aaf6a0c2ea442d842b48f12f2..83b79a19c403bd2f091a3c5a36c6ac30a3f19bcf 100644 |
| --- a/src/ia32/lithium-codegen-ia32.cc |
| +++ b/src/ia32/lithium-codegen-ia32.cc |
| @@ -4175,11 +4175,14 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) { |
| __ Set(eax, Immediate(instr->arity())); |
| __ mov(ebx, instr->hydrogen()->property_cell()); |
| ElementsKind kind = instr->hydrogen()->elements_kind(); |
| - bool disable_allocation_sites = |
| - (AllocationSiteInfo::GetMode(kind) == TRACK_ALLOCATION_SITE); |
| + AllocationSiteOverrideMode override_mode = |
| + (AllocationSiteInfo::GetMode(kind) == TRACK_ALLOCATION_SITE) |
| + ? DISABLE_ALLOCATION_SITES |
|
danno
2013/06/27 20:35:54
nit: indent this line and the next 4 spaces
mvstanton
2013/06/28 13:52:45
Done.
|
| + : DONT_OVERRIDE; |
| + ContextCheckMode context_mode = CONTEXT_CHECK_NOT_REQUIRED; |
| if (instr->arity() == 0) { |
| - ArrayNoArgumentConstructorStub stub(kind, disable_allocation_sites); |
| + ArrayNoArgumentConstructorStub stub(kind, context_mode, override_mode); |
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
| } else if (instr->arity() == 1) { |
| Label done; |
| @@ -4192,18 +4195,18 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) { |
| __ j(zero, &packed_case); |
| ElementsKind holey_kind = GetHoleyElementsKind(kind); |
| - ArraySingleArgumentConstructorStub stub(holey_kind, |
| - disable_allocation_sites); |
| + ArraySingleArgumentConstructorStub stub(holey_kind, context_mode, |
| + override_mode); |
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
| __ jmp(&done); |
| __ bind(&packed_case); |
| } |
| - ArraySingleArgumentConstructorStub stub(kind, disable_allocation_sites); |
| + ArraySingleArgumentConstructorStub stub(kind, context_mode, override_mode); |
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
| __ bind(&done); |
| } else { |
| - ArrayNArgumentsConstructorStub stub(kind, disable_allocation_sites); |
| + ArrayNArgumentsConstructorStub stub(kind, context_mode, override_mode); |
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr); |
| } |
| } |