Modified: trunk/Source/_javascript_Core/ChangeLog (106263 => 106264)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-30 19:23:42 UTC (rev 106263)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-30 19:26:48 UTC (rev 106264)
@@ -1,3 +1,9 @@
+2012-01-30 Gavin Barraclough <[email protected]>
+
+ Unreviewed build fix following bug#76855
+
+ * _javascript_Core.exp:
+
2012-01-30 Michael Saboff <[email protected]>
CaseFoldingHash::hash() doesn't handle 8 bit strings directly
Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (106263 => 106264)
--- trunk/Source/_javascript_Core/_javascript_Core.exp 2012-01-30 19:23:42 UTC (rev 106263)
+++ trunk/Source/_javascript_Core/_javascript_Core.exp 2012-01-30 19:26:48 UTC (rev 106264)
@@ -415,6 +415,7 @@
__ZN3WTF13MetaAllocator17addFreshFreeSpaceEPvm
__ZN3WTF13MetaAllocator17freeFreeSpaceNodeEPNS0_13FreeSpaceNodeE
__ZN3WTF13MetaAllocator18debugFreeSpaceSizeEv
+__ZN3WTF13MetaAllocator8allocateEmPv
__ZN3WTF13MetaAllocatorC2Em
__ZN3WTF13StringBuilder11shrinkToFitEv
__ZN3WTF13StringBuilder15reserveCapacityEj
Modified: trunk/Tools/ChangeLog (106263 => 106264)
--- trunk/Tools/ChangeLog 2012-01-30 19:23:42 UTC (rev 106263)
+++ trunk/Tools/ChangeLog 2012-01-30 19:26:48 UTC (rev 106264)
@@ -1,3 +1,11 @@
+2012-01-30 Gavin Barraclough <[email protected]>
+
+ Unreviewed build fix following bug#76855
+
+ * TestWebKitAPI/Tests/WTF/MetaAllocator.cpp:
+ ():
+ (TestWebKitAPI::TEST_F):
+
2012-01-26 No'am Rosenthal <[email protected]> and Jocelyn Turcotte <[email protected]>
[Qt] WKTR: Use a software rendering pipiline when running tests.
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp (106263 => 106264)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp 2012-01-30 19:23:42 UTC (rev 106263)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp 2012-01-30 19:26:48 UTC (rev 106264)
@@ -182,7 +182,7 @@
MetaAllocatorHandle* allocate(size_t sizeInBytes, SanityCheckMode sanityCheckMode = RunSanityCheck)
{
- MetaAllocatorHandle* handle = allocator->allocate(sizeInBytes).leakRef();
+ MetaAllocatorHandle* handle = allocator->allocate(sizeInBytes, 0).leakRef();
EXPECT_TRUE(handle);
EXPECT_EQ(handle->sizeInBytes(), sizeInBytes);
@@ -464,7 +464,7 @@
sanityCheck();
- EXPECT_TRUE(!allocator->allocate(sizeInBytes));
+ EXPECT_TRUE(!allocator->allocate(sizeInBytes, 0));
for (size_t index = 0; index < numAllocations; ++index)
free(handles.at(index), DontRunSanityCheck);
@@ -571,7 +571,7 @@
sanityCheck();
// Assert that the heap is not empty.
- EXPECT_TRUE(!allocator->allocate(defaultPagesInHeap * pageSize()));
+ EXPECT_TRUE(!allocator->allocate(defaultPagesInHeap * pageSize(), 0));
// Allocate the remainder of the heap.
MetaAllocatorHandle* remainder = allocate(defaultPagesInHeap * pageSize() - secondSize);
@@ -589,12 +589,12 @@
void testDemandAllocCoalesce(size_t firstSize, size_t numPages, size_t secondSize)
{
- EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize()));
+ EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize(), 0));
MetaAllocatorHandle* firstHandle = allocate(firstSize);
- EXPECT_TRUE(!allocator->allocate(secondSize));
- EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize()));
+ EXPECT_TRUE(!allocator->allocate(secondSize, 0));
+ EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize(), 0));
currentHeapGrowthMode = ForTestDemandAllocCoalesce;
allowAllocatePages = numPages;
@@ -618,12 +618,12 @@
{
free(allocate(firstSize));
free(allocate(defaultPagesInHeap * pageSize()));
- EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize()));
+ EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize(), 0));
MetaAllocatorHandle* firstHandle = allocate(firstSize);
- EXPECT_TRUE(!allocator->allocate(secondSize));
- EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize()));
+ EXPECT_TRUE(!allocator->allocate(secondSize, 0));
+ EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize(), 0));
currentHeapGrowthMode = ForTestDemandAllocDontCoalesce;
allowAllocatePages = numPages;
@@ -637,12 +637,12 @@
requestedNumPages = 0;
- EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize()));
+ EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize(), 0));
free(firstHandle);
free(secondHandle);
- EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize()));
+ EXPECT_TRUE(!allocator->allocate((defaultPagesInHeap + numPages) * pageSize(), 0));
firstHandle = allocate(firstSize);
secondHandle = allocate(secondSize);
@@ -663,7 +663,7 @@
// Tests that allocating a zero-length block returns 0 and
// does not change anything in memory.
- ASSERT(!allocator->allocate(0));
+ ASSERT(!allocator->allocate(0, 0));
MetaAllocatorHandle* final = allocate(defaultPagesInHeap * pageSize());
EXPECT_EQ(final->start(), reinterpret_cast<void*>(basePage * pageSize()));
