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()) | |
207 return true; | |
208 if (&ThreadState::current()->heap() != &pageFromObject(object)->arena()- >getThreadState()->heap()) | |
209 return true; | |
haraken
2016/05/26 07:52:29
Hmm, you still have this code?
keishi
2016/05/26 11:52:54
Sorry, probably made a mistake with git.
I've cha
| |
205 return ObjectAliveTrait<T>::isHeapObjectAlive(object); | 210 return ObjectAliveTrait<T>::isHeapObjectAlive(object); |
206 } | 211 } |
207 template<typename T> | 212 template<typename T> |
208 static inline bool isHeapObjectAlive(const Member<T>& member) | 213 static inline bool isHeapObjectAlive(const Member<T>& member) |
209 { | 214 { |
210 return isHeapObjectAlive(member.get()); | 215 return isHeapObjectAlive(member.get()); |
211 } | 216 } |
212 template<typename T> | 217 template<typename T> |
213 static inline bool isHeapObjectAlive(const WeakMember<T>& member) | 218 static inline bool isHeapObjectAlive(const WeakMember<T>& member) |
214 { | 219 { |
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
594 void VisitorHelper<Derived>::handleWeakCell(Visitor* self, void* object) | 599 void VisitorHelper<Derived>::handleWeakCell(Visitor* self, void* object) |
595 { | 600 { |
596 T** cell = reinterpret_cast<T**>(object); | 601 T** cell = reinterpret_cast<T**>(object); |
597 if (*cell && !ObjectAliveTrait<T>::isHeapObjectAlive(*cell)) | 602 if (*cell && !ObjectAliveTrait<T>::isHeapObjectAlive(*cell)) |
598 *cell = nullptr; | 603 *cell = nullptr; |
599 } | 604 } |
600 | 605 |
601 } // namespace blink | 606 } // namespace blink |
602 | 607 |
603 #endif // Heap_h | 608 #endif // Heap_h |
OLD | NEW |