Chromium Code Reviews| Index: src/hydrogen-instructions.cc |
| diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc |
| index e7ad219964b3946b35e81dbd76011d7e8ff2133f..f13f0959a323824f100f95c2b689dd56c47e5b6f 100644 |
| --- a/src/hydrogen-instructions.cc |
| +++ b/src/hydrogen-instructions.cc |
| @@ -3492,7 +3492,9 @@ void HAllocate::HandleSideEffectDominator(GVNFlag side_effect, |
| dominator_allocate->ClearNextMapWord(original_object_size); |
| #endif |
| - dominator_allocate->clear_next_map_word_ = clear_next_map_word_; |
| + dominator_allocate->flags_ = static_cast<Flags>( |
| + (dominator_allocate->flags_ & ~CLEAR_NEXT_MAP_WORD) | |
| + (flags_ & CLEAR_NEXT_MAP_WORD)); |
|
mvstanton
2013/12/11 13:03:21
Put this into an inline setter.
Benedikt Meurer
2013/12/11 13:43:40
Done.
|
| // After that replace the dominated allocate instruction. |
| HInstruction* dominated_allocate_instr = |
| @@ -3628,7 +3630,7 @@ void HAllocate::CreateFreeSpaceFiller(int32_t free_space_size) { |
| void HAllocate::ClearNextMapWord(int offset) { |
| - if (clear_next_map_word_) { |
| + if (MustClearNextMapWord()) { |
| Zone* zone = block()->zone(); |
| HObjectAccess access = HObjectAccess::ForJSObjectOffset(offset); |
| HStoreNamedField* clear_next_map = |