Changeset 286811 in webkit

Timestamp:

Dec 9, 2021, 3:20:39 PM (5 years ago)

Author:

Tyler Wilcock

Message:

AX: Improve ASSERT while processing tree appends in AXIsolatedTree::applyPendingChanges
​https://bugs.webkit.org/show_bug.cgi?id=234085

Reviewed by Chris Fleizach.

When processing m_pendingAppends in AXIsolatedTree::applyPendingChanges,
we ASSERT to verify the refcount is what we expect:

ASSERT_UNUSED(addResult, addResult.iterator->value->refCount() == 2

(addResult.iterator->value.ptr() == m_rootNode.get() && m_rootNode->refCount() == 3));

But this doesn't include the actual refcount in the ASSERT message,
making it harder to debug.

This patch uses ASSERT_WITH_MESSAGE to display the actual refcount.

• accessibility/isolatedtree/AXIsolatedTree.cpp:

(WebCore::AXIsolatedTree::applyPendingChanges):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedTree.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-09  Tyler Wilcock  <tyler_w@apple.com>
+
+        AX: Improve ASSERT while processing tree appends in AXIsolatedTree::applyPendingChanges
+        https://bugs.webkit.org/show_bug.cgi?id=234085
+
+        Reviewed by Chris Fleizach.
+
+        When processing m_pendingAppends in AXIsolatedTree::applyPendingChanges,
+        we ASSERT to verify the refcount is what we expect:
+
+        ASSERT_UNUSED(addResult, addResult.iterator->value->refCount() == 2
+            || (addResult.iterator->value.ptr() == m_rootNode.get() && m_rootNode->refCount() == 3));
+
+        But this doesn't include the actual refcount in the ASSERT message,
+        making it harder to debug.
+
+        This patch uses ASSERT_WITH_MESSAGE to display the actual refcount.
+
+        * accessibility/isolatedtree/AXIsolatedTree.cpp:
+        (WebCore::AXIsolatedTree::applyPendingChanges):
+
 2021-12-09  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp

@@ -513 +513 @@
         // because it is referenced by m_readerThreadNodeMap and m_pendingAppends.
         // When m_pendingAppends is cleared, the object will be held only by m_readerThreadNodeMap. The exception is the root node whose reference count is 3.
-        ASSERT_UNUSED(addResult, addResult.iterator->value->refCount() == 2
-            || (addResult.iterator->value.ptr() == m_rootNode.get() && m_rootNode->refCount() == 3));
+        ASSERT_WITH_MESSAGE(
+            addResult.iterator->value->refCount() == 2 || (addResult.iterator->value.ptr() == m_rootNode.get() && m_rootNode->refCount() == 3),
+            "unexpected ref count after adding object to m_readerThreadNodeMap: %d", addResult.iterator->value->refCount()
+        );
     }
     m_pendingAppends.clear();