Title: [92329] trunk/Source/_javascript_Core
- Revision
- 92329
- Author
- [email protected]
- Date
- 2011-08-03 16:35:03 -0700 (Wed, 03 Aug 2011)
Log Message
JSC GC heap size improvement breaks build on some platforms due to
unused parameter
https://bugs.webkit.org/show_bug.cgi?id=65641
Reviewed by Darin Adler.
Fix build on non-x86 platforms, by ensuring that the relevant
parameter always appears to be used even when it isn't.
* heap/Heap.cpp:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (92328 => 92329)
--- trunk/Source/_javascript_Core/ChangeLog 2011-08-03 23:31:50 UTC (rev 92328)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-08-03 23:35:03 UTC (rev 92329)
@@ -1,3 +1,16 @@
+2011-08-03 Filip Pizlo <[email protected]>
+
+ JSC GC heap size improvement breaks build on some platforms due to
+ unused parameter
+ https://bugs.webkit.org/show_bug.cgi?id=65641
+
+ Reviewed by Darin Adler.
+
+ Fix build on non-x86 platforms, by ensuring that the relevant
+ parameter always appears to be used even when it isn't.
+
+ * heap/Heap.cpp:
+
2011-08-03 Carlos Garcia Campos <[email protected]>
[GTK] Reorganize pkg-config files
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (92328 => 92329)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2011-08-03 23:31:50 UTC (rev 92328)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2011-08-03 23:35:03 UTC (rev 92329)
@@ -42,14 +42,20 @@
namespace {
+static const size_t largeHeapSize = 16 * 1024 * 1024;
+static const size_t smallHeapSize = 512 * 1024;
+
static size_t heapSizeForHint(HeapSize heapSize)
{
#if ENABLE(LARGE_HEAP)
if (heapSize == LargeHeap)
- return 16 * 1024 * 1024;
+ return largeHeapSize;
ASSERT(heapSize == SmallHeap);
+ return smallHeapSize;
+#else
+ ASSERT_UNUSED(heapSize, heapSize == LargeHeap || heapSize == SmallHeap);
+ return smallHeapSize;
#endif
- return 512 * 1024;
}
static inline bool isValidSharedInstanceThreadState()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
