Chromium Code Reviews| Index: src/arm/codegen-arm.cc |
| diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc |
| index 9d008232e356871e9a0aac2b49ebebf10b41fbd2..1a5d01d43a83adb7929a6a9971b14267b7592a6e 100644 |
| --- a/src/arm/codegen-arm.cc |
| +++ b/src/arm/codegen-arm.cc |
| @@ -144,7 +144,7 @@ void StubRuntimeCallHelper::AfterCall(MacroAssembler* masm) const { |
| #define __ ACCESS_MASM(masm) |
| void ElementsTransitionGenerator::GenerateMapChangeElementsTransition( |
| - MacroAssembler* masm) { |
| + MacroAssembler* masm, Label* fail) { |
|
danno
2013/01/10 22:58:59
nit: here and elsewhere it might be clearer if you
mvstanton
2013/01/11 13:43:01
Done.
|
| // ----------- S t a t e ------------- |
| // -- r0 : value |
| // -- r1 : key |
| @@ -153,6 +153,10 @@ void ElementsTransitionGenerator::GenerateMapChangeElementsTransition( |
| // -- r3 : target map, scratch for subsequent call |
| // -- r4 : scratch (elements) |
| // ----------------------------------- |
| + if (FLAG_track_allocation_sites && fail != NULL) { |
| + masm->TestJSArrayForAllocationSiteInfo(r2, r4, fail); |
| + } |
| + |
| // Set transitioned map. |
| __ str(r3, FieldMemOperand(r2, HeapObject::kMapOffset)); |
| __ RecordWriteField(r2, |