| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 ThreadState::resumeThreads(); | 405 ThreadState::resumeThreads(); |
| 406 } | 406 } |
| 407 } | 407 } |
| 408 | 408 |
| 409 private: | 409 private: |
| 410 ThreadState* m_state; | 410 ThreadState* m_state; |
| 411 ThreadState::SafePointScope m_safePointScope; | 411 ThreadState::SafePointScope m_safePointScope; |
| 412 bool m_parkedAllThreads; // False if we fail to park all threads | 412 bool m_parkedAllThreads; // False if we fail to park all threads |
| 413 }; | 413 }; |
| 414 | 414 |
| 415 NO_SANITIZE_ADDRESS |
| 415 bool HeapObjectHeader::isMarked() const | 416 bool HeapObjectHeader::isMarked() const |
| 416 { | 417 { |
| 417 checkHeader(); | 418 checkHeader(); |
| 418 // We need to unpoison/poison the header on ASAN since | 419 unsigned size = asanAcquireLoad(&m_size); |
| 419 // acquireLoad doesn't have the NO_SANITIZE_ADDRESS flag. | |
| 420 ASAN_UNPOISON_MEMORY_REGION(this, sizeof(this)); | |
| 421 unsigned size = acquireLoad(&m_size); | |
| 422 ASAN_POISON_MEMORY_REGION(this, sizeof(this)); | |
| 423 return size & markBitMask; | 420 return size & markBitMask; |
| 424 } | 421 } |
| 425 | 422 |
| 426 NO_SANITIZE_ADDRESS | 423 NO_SANITIZE_ADDRESS |
| 427 void HeapObjectHeader::unmark() | 424 void HeapObjectHeader::unmark() |
| 428 { | 425 { |
| 429 checkHeader(); | 426 checkHeader(); |
| 430 m_size &= ~markBitMask; | 427 m_size &= ~markBitMask; |
| 431 } | 428 } |
| 432 | 429 |
| (...skipping 2413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2846 CallbackStack* Heap::s_markingStack; | 2843 CallbackStack* Heap::s_markingStack; |
| 2847 CallbackStack* Heap::s_postMarkingCallbackStack; | 2844 CallbackStack* Heap::s_postMarkingCallbackStack; |
| 2848 CallbackStack* Heap::s_weakCallbackStack; | 2845 CallbackStack* Heap::s_weakCallbackStack; |
| 2849 CallbackStack* Heap::s_ephemeronStack; | 2846 CallbackStack* Heap::s_ephemeronStack; |
| 2850 HeapDoesNotContainCache* Heap::s_heapDoesNotContainCache; | 2847 HeapDoesNotContainCache* Heap::s_heapDoesNotContainCache; |
| 2851 bool Heap::s_shutdownCalled = false; | 2848 bool Heap::s_shutdownCalled = false; |
| 2852 bool Heap::s_lastGCWasConservative = false; | 2849 bool Heap::s_lastGCWasConservative = false; |
| 2853 FreePagePool* Heap::s_freePagePool; | 2850 FreePagePool* Heap::s_freePagePool; |
| 2854 OrphanedPagePool* Heap::s_orphanedPagePool; | 2851 OrphanedPagePool* Heap::s_orphanedPagePool; |
| 2855 } | 2852 } |
| OLD | NEW |