From 49233e234e5c787396cadb2cea33b31ae0cd65c1 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 20 Jun 2012 13:01:08 +0200
Subject: Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327
 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes
---
 Source/JavaScriptCore/heap/WeakBlock.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Source/JavaScriptCore/heap/WeakBlock.cpp')

diff --git a/Source/JavaScriptCore/heap/WeakBlock.cpp b/Source/JavaScriptCore/heap/WeakBlock.cpp
index 685779d3a..8900e73df 100644
--- a/Source/JavaScriptCore/heap/WeakBlock.cpp
+++ b/Source/JavaScriptCore/heap/WeakBlock.cpp
@@ -69,7 +69,8 @@ void WeakBlock::lastChanceToFinalize()
 
 void WeakBlock::sweep()
 {
-    if (!m_sweepResult.isNull())
+    // If a block is completely empty, a sweep won't have any effect.
+    if (isEmpty())
         return;
 
     SweepResult sweepResult;
-- 
cgit v1.2.1