Chromium Code Reviews| 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 static inline bool isHeapObjectAlive(T* object) | 195 static inline bool isHeapObjectAlive(T* object) |
| 196 { | 196 { |
| 197 static_assert(sizeof(T), "T must be fully defined"); | 197 static_assert(sizeof(T), "T must be fully defined"); |
| 198 // The strongification of collections relies on the fact that once a | 198 // The strongification of collections relies on the fact that once a |
| 199 // collection has been strongified, there is no way that it can contain | 199 // collection has been strongified, there is no way that it can contain |
| 200 // non-live entries, so no entries will be removed. Since you can't set | 200 // non-live entries, so no entries will be removed. Since you can't set |
| 201 // the mark bit on a null pointer, that means that null pointers are | 201 // the mark bit on a null pointer, that means that null pointers are |
| 202 // always 'alive'. | 202 // always 'alive'. |
| 203 if (!object) | 203 if (!object) |
| 204 return true; | 204 return true; |
| 205 // TODO(keishi): some tests create CrossThreadPersistent on non attached threads. | |
| 206 if (!ThreadState::current()) | |
|
sof
2016/05/26 12:09:41
What's going wrong without this bail out? I though
keishi
2016/05/26 12:32:04
Sorry this is part of https://codereview.chromium.
| |
| 207 return true; | |
| 205 return ObjectAliveTrait<T>::isHeapObjectAlive(object); | 208 return ObjectAliveTrait<T>::isHeapObjectAlive(object); |
| 206 } | 209 } |
| 207 template<typename T> | 210 template<typename T> |
| 208 static inline bool isHeapObjectAlive(const Member<T>& member) | 211 static inline bool isHeapObjectAlive(const Member<T>& member) |
| 209 { | 212 { |
| 210 return isHeapObjectAlive(member.get()); | 213 return isHeapObjectAlive(member.get()); |
| 211 } | 214 } |
| 212 template<typename T> | 215 template<typename T> |
| 213 static inline bool isHeapObjectAlive(const WeakMember<T>& member) | 216 static inline bool isHeapObjectAlive(const WeakMember<T>& member) |
| 214 { | 217 { |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 594 void VisitorHelper<Derived>::handleWeakCell(Visitor* self, void* object) | 597 void VisitorHelper<Derived>::handleWeakCell(Visitor* self, void* object) |
| 595 { | 598 { |
| 596 T** cell = reinterpret_cast<T**>(object); | 599 T** cell = reinterpret_cast<T**>(object); |
| 597 if (*cell && !ObjectAliveTrait<T>::isHeapObjectAlive(*cell)) | 600 if (*cell && !ObjectAliveTrait<T>::isHeapObjectAlive(*cell)) |
| 598 *cell = nullptr; | 601 *cell = nullptr; |
| 599 } | 602 } |
| 600 | 603 |
| 601 } // namespace blink | 604 } // namespace blink |
| 602 | 605 |
| 603 #endif // Heap_h | 606 #endif // Heap_h |
| OLD | NEW |