[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 98b8e8799b29a0f7c5ea601b4d66d219c2619dd2
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 14:13:31 2009 +0000

    Unreviewed trivial buildfix.
    
    Patch by Gabor Loki <loki at inf.u-szeged.hu> on 2009-12-14
    Fix crosses initialization of usedPrimaryBlocks for JSValue32
    
    * runtime/Collector.cpp:
    (JSC::Heap::markConservatively):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4b16c0a..58f0f9a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-14  Gabor Loki  <loki at inf.u-szeged.hu>
+
+        Unreviewed trivial buildfix.
+
+        Fix crosses initialization of usedPrimaryBlocks for JSValue32
+
+        * runtime/Collector.cpp:
+        (JSC::Heap::markConservatively):
+
 2009-12-14  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/runtime/Collector.cpp b/JavaScriptCore/runtime/Collector.cpp
index af1fb7d..5446749 100644
--- a/JavaScriptCore/runtime/Collector.cpp
+++ b/JavaScriptCore/runtime/Collector.cpp
@@ -789,6 +789,7 @@ void Heap::markConservatively(MarkStack& markStack, void* start, void* end)
     while (p != e) {
         char* x = *p++;
         if (isPossibleCell(x)) {
+            size_t usedPrimaryBlocks;
             uintptr_t xAsBits = reinterpret_cast<uintptr_t>(x);
             xAsBits &= CELL_ALIGN_MASK;
 
@@ -810,7 +811,7 @@ void Heap::markConservatively(MarkStack& markStack, void* start, void* end)
 #endif
 
             // Mark the primary heap
-            size_t usedPrimaryBlocks = primaryHeap.usedBlocks;
+            usedPrimaryBlocks = primaryHeap.usedBlocks;
             for (size_t block = 0; block < usedPrimaryBlocks; block++) {
                 if (primaryBlocks[block] != blockAddr)
                     continue;

-- 
WebKit Debian packaging