diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
| commit | 08d4a74d56ca431877819fc4566e27eafe150342 (patch) | |
| tree | ebd8530838ab390c015c6b7e659a22852c1663ae /Source/JavaScriptCore/heap/ConservativeRoots.cpp | |
| parent | 1de6cd4794bbd5a52189384189a2b8df1848b39b (diff) | |
| download | qtwebkit-08d4a74d56ca431877819fc4566e27eafe150342.tar.gz | |
Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477)
New snapshot that adapts to latest Qt API changes
Diffstat (limited to 'Source/JavaScriptCore/heap/ConservativeRoots.cpp')
| -rw-r--r-- | Source/JavaScriptCore/heap/ConservativeRoots.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/JavaScriptCore/heap/ConservativeRoots.cpp b/Source/JavaScriptCore/heap/ConservativeRoots.cpp index 6b9cbef45..7fe22dfff 100644 --- a/Source/JavaScriptCore/heap/ConservativeRoots.cpp +++ b/Source/JavaScriptCore/heap/ConservativeRoots.cpp @@ -66,10 +66,8 @@ template<typename MarkHook> inline void ConservativeRoots::genericAddPointer(void* p, TinyBloomFilter filter, MarkHook& markHook) { markHook.mark(p); - - CopiedBlock* block; - if (m_copiedSpace->contains(p, block)) - m_copiedSpace->pin(block); + + m_copiedSpace->pinIfNecessary(p); MarkedBlock* candidate = MarkedBlock::blockFor(p); if (filter.ruleOut(reinterpret_cast<Bits>(candidate))) { |