Modified: trunk/Source/WTF/ChangeLog (126474 => 126475)
--- trunk/Source/WTF/ChangeLog 2012-08-23 20:39:11 UTC (rev 126474)
+++ trunk/Source/WTF/ChangeLog 2012-08-23 20:50:13 UTC (rev 126475)
@@ -1,3 +1,16 @@
+2012-08-23 Mark Rowe <[email protected]>
+
+ Make WTF build with the latest version of clang.
+
+ Reviewed by Dan Bernstein.
+
+ * wtf/FastMalloc.cpp:
+ (WTF): Disable the -Wunused-private-field warning around the declaration of
+ TCMalloc_Central_FreeListPadded since the padding is intentionally unused.
+ (WTF::AdminRegionRecorder): Remove the unused m_reader member.
+ (WTF::FastMallocZone::enumerate): Don't pass in the RemoteMemoryReader since
+ it is no longer needed.
+
2012-08-22 Geoffrey Garen <[email protected]>
Fixed a fastMallocForbid/Allow compile error for some compilers
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (126474 => 126475)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2012-08-23 20:39:11 UTC (rev 126474)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2012-08-23 20:50:13 UTC (rev 126475)
@@ -2469,12 +2469,21 @@
int32_t cache_size_;
};
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-private-field"
+#endif
+
// Pad each CentralCache object to multiple of 64 bytes
class TCMalloc_Central_FreeListPadded : public TCMalloc_Central_FreeList {
private:
char pad_[(64 - (sizeof(TCMalloc_Central_FreeList) % 64)) % 64];
};
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
//-------------------------------------------------------------------
// Global variables
//-------------------------------------------------------------------
@@ -4539,17 +4548,15 @@
void* m_context;
unsigned m_typeMask;
vm_range_recorder_t* m_recorder;
- const RemoteMemoryReader& m_reader;
Vector<vm_range_t, 1024> m_pendingRegions;
public:
- AdminRegionRecorder(task_t task, void* context, unsigned typeMask, vm_range_recorder_t* recorder, const RemoteMemoryReader& reader)
+ AdminRegionRecorder(task_t task, void* context, unsigned typeMask, vm_range_recorder_t* recorder)
: m_task(task)
, m_context(context)
, m_typeMask(typeMask)
, m_recorder(recorder)
- , m_reader(reader)
{ }
void recordRegion(vm_address_t ptr, size_t size)
@@ -4602,7 +4609,7 @@
pageMap->visitValues(usageRecorder, memoryReader);
usageRecorder.recordPendingRegions();
- AdminRegionRecorder adminRegionRecorder(task, context, typeMask, recorder, memoryReader);
+ AdminRegionRecorder adminRegionRecorder(task, context, typeMask, recorder);
pageMap->visitAllocations(adminRegionRecorder, memoryReader);
PageHeapAllocator<Span>* spanAllocator = memoryReader(mzone->m_spanAllocator);
