Changeset 38750 in webkit for trunk/JavaScriptCore/runtime/Collector.cpp

Timestamp:

Nov 25, 2008, 2:05:51 AM (17 years ago)

Author:

[email protected]

Message:

2008-11-25 Cameron Zwarich <​[email protected]>

Reviewed by Alexey Proskuryakov.

Move the collect() call in Heap::heapAllocate() that is conditionally
compiled under COLLECT_ON_EVERY_ALLOCATION so that it is before we get
information about the heap. This was causing assertion failures for me
while I was reducing a bug.

• runtime/Collector.cpp: (JSC::Heap::heapAllocate):

File:

• trunk/JavaScriptCore/runtime/Collector.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -288 +288 @@
     // deallocation code.
 
+#if COLLECT_ON_EVERY_ALLOCATION
+    collect();
+#endif
+
     size_t numLiveObjects = heap.numLiveObjects;
     size_t usedBlocks = heap.usedBlocks;
     size_t i = heap.firstBlockWithPossibleSpace;
-
-#if COLLECT_ON_EVERY_ALLOCATION
-    collect();
-#endif
 
     // if we have a huge amount of extra cost, we'll try to collect even if we still have