Chromium Code Reviews| Index: src/objects-inl.h |
| =================================================================== |
| --- src/objects-inl.h (revision 6183) |
| +++ src/objects-inl.h (working copy) |
| @@ -795,7 +795,6 @@ |
| #define WRITE_BARRIER(object, offset) \ |
| Heap::RecordWrite(object->address(), offset); |
| -#ifdef ENABLE_CARDMARKING_WRITE_BARRIER |
| // CONDITIONAL_WRITE_BARRIER must be issued after the actual |
| // write due to the assert validating the written value. |
| #define CONDITIONAL_WRITE_BARRIER(object, offset, mode) \ |
| @@ -804,13 +803,8 @@ |
| } else { \ |
| ASSERT(mode == SKIP_WRITE_BARRIER); \ |
| ASSERT(Heap::InNewSpace(object) || \ |
| - !Heap::InNewSpace(READ_FIELD(object, offset)) || \ |
|
Vyacheslav Egorov (Chromium)
2011/01/21 18:18:18
This check was here for some reason.
Somewhere in
Erik Corry
2011/01/24 13:56:00
Done.
|
| - Page::FromAddress(object->address())-> \ |
| - IsRegionDirty(object->address() + offset)); \ |
| + !Heap::InNewSpace(READ_FIELD(object, offset))); \ |
| } |
| -#else |
| -#define CONDITIONAL_WRITE_BARRIER(object, offset, mode) |
| -#endif |
| #define READ_DOUBLE_FIELD(p, offset) \ |
| (*reinterpret_cast<double*>(FIELD_ADDR(p, offset))) |