For large (but not direct mapped) allocations, track the real allocation size.

Source/wtf/PartitionAllocTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1455 matching lines @@
         partitionFreeGeneric(genericAllocator.root(), ptr);
 
         // Whilst we're here, allocate again and free with different ordering
         // to give a workout to our linked list code.
         ptr = partitionAllocGeneric(genericAllocator.root(), sizeSmaller);
         ptr2 = partitionAllocGeneric(genericAllocator.root(), sizeBigger);
         partitionFreeGeneric(genericAllocator.root(), ptr);
         partitionFreeGeneric(genericAllocator.root(), ptr2);
     }
 
+    // This test checks large-but-not-quite-direct allocations.
+    {
+        void* ptr = partitionAllocGeneric(genericAllocator.root(), 65537);
+
+        {
+            MockPartitionStatsDumper mockStatsDumperGeneric;
+            partitionDumpStatsGeneric(genericAllocator.root(), "mock_generic_allocator", &mockStatsDumperGeneric);
+            EXPECT_TRUE(mockStatsDumperGeneric.IsMemoryAllocationRecorded());
+
+            size_t slotSize = 65536 + (65536 / WTF::kGenericNumBucketsPerOrder);
+            const WTF::PartitionBucketMemoryStats* stats = mockStatsDumperGeneric.GetBucketStats(slotSize);
+            EXPECT_TRUE(stats);
+            EXPECT_TRUE(stats->isValid);
+            EXPECT_FALSE(stats->isDirectMap);
+            EXPECT_EQ(slotSize, stats->bucketSlotSize);
+            EXPECT_EQ(65536 + WTF::kSystemPageSize, stats->activeBytes);
+            EXPECT_EQ(slotSize, stats->residentBytes);
+            EXPECT_EQ(0u, stats->freeableBytes);
+            EXPECT_EQ(1u, stats->numFullPages);
+            EXPECT_EQ(0u, stats->numActivePages);
+            EXPECT_EQ(0u, stats->numEmptyPages);
+            EXPECT_EQ(0u, stats->numDecommittedPages);
+        }
+
+        partitionFreeGeneric(genericAllocator.root(), ptr);
+    }
+
     TestShutdown();
 }
 
 // Tests the API to purge freeable memory.
 TEST(PartitionAllocTest, Purge)
 {
     TestSetup();
 
     void* ptr = partitionAllocGeneric(genericAllocator.root(), 2048 - kExtraAllocSize);
     partitionFreeGeneric(genericAllocator.root(), ptr);
@@ skipping 47 matching lines @@
     EXPECT_EQ(32u, WTF::countLeadingZerosSizet(0u));
     EXPECT_EQ(31u, WTF::countLeadingZerosSizet(1u));
     EXPECT_EQ(1u, WTF::countLeadingZerosSizet(1u << 30));
     EXPECT_EQ(0u, WTF::countLeadingZerosSizet(1u << 31));
 #endif
 }
 
 } // namespace
 
 #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)