Changeset 142242 in webkit

Timestamp:

Feb 8, 2013 12:24:16 AM (11 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: Native Memory Instrumentation: reportBaseAddress needs to be called after the reportNode. So it may reuse the node index for the real address.
​https://bugs.webkit.org/show_bug.cgi?id=109051

Reviewed by Yury Semikhatsky.

• wtf/MemoryInstrumentation.cpp:

(WTF::MemoryInstrumentation::WrapperBase::processPointer):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MemoryInstrumentation.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-02-06  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: Native Memory Instrumentation: reportBaseAddress needs to be called after the reportNode. So it may reuse the node index for the real address.
+        https://bugs.webkit.org/show_bug.cgi?id=109051
+
+        Reviewed by Yury Semikhatsky.
+
+        * wtf/MemoryInstrumentation.cpp:
+        (WTF::MemoryInstrumentation::WrapperBase::processPointer):
+
 2013-02-07  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WTF/wtf/MemoryInstrumentation.cpp

@@ -92 +92 @@
     const void* realAddress = memoryObjectInfo.reportedPointer();
     ASSERT(realAddress);
-    if (realAddress != m_pointer) {
+
+    if (memoryObjectInfo.firstVisit()) {
+        memoryInstrumentation->countObjectSize(realAddress, memoryObjectInfo.objectType(), memoryObjectInfo.objectSize());
+        memoryInstrumentation->m_client->reportNode(memoryObjectInfo);
+    }
+
+    if (realAddress != m_pointer)
         memoryInstrumentation->m_client->reportBaseAddress(m_pointer, realAddress);
-        if (!memoryObjectInfo.firstVisit())
-            return;
-    }
-    memoryInstrumentation->countObjectSize(realAddress, memoryObjectInfo.objectType(), memoryObjectInfo.objectSize());
-    memoryInstrumentation->m_client->reportNode(memoryObjectInfo);
-    if (!memoryObjectInfo.customAllocation() && !memoryInstrumentation->checkCountedObject(realAddress)) {
+
+    if (memoryObjectInfo.firstVisit()
+        && !memoryObjectInfo.customAllocation()
+        && !memoryInstrumentation->checkCountedObject(realAddress)) {
 #if DEBUG_POINTER_INSTRUMENTATION
         fputs("Unknown object counted:\n", stderr);