Changeset 117013 in webkit for trunk/Source/JavaScriptCore/heap/MarkStack.cpp

Timestamp:

May 14, 2012, 4:45:45 PM (13 years ago)

Author:

[email protected]

Message:

Increase Debug Logging in MarkStack::validate()
​https://bugs.webkit.org/show_bug.cgi?id=86408

Rubber-stamped by Filip Pizlo.

Added some descriptive debug messages for the conditions and
values when a cell validation fails.

• heap/MarkStack.cpp:

(JSC::MarkStack::validate):

File:

• trunk/Source/JavaScriptCore/heap/MarkStack.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/MarkStack.cpp

@@ -38 +38 @@
 #include "Structure.h"
 #include "WriteBarrier.h"
+#include <wtf/DataLog.h>
 #include <wtf/MainThread.h>
 
@@ -536 +537 @@
 void MarkStack::validate(JSCell* cell)
 {
-    if (!cell)
+    if (!cell) {
+        dataLog("cell is NULL\n");
         CRASH();
-
-    if (!cell->structure())
+    }
+
+    if (!cell->structure()) {
+        dataLog("cell at %p has a null structure\n" , cell);
         CRASH();
+    }
 
     // Both the cell's structure, and the cell's structure's structure should be the Structure Structure.
     // I hate this sentence.
-    if (cell->structure()->structure()->JSCell::classInfo() != cell->structure()->JSCell::classInfo())
+    if (cell->structure()->structure()->JSCell::classInfo() != cell->structure()->JSCell::classInfo()) {
+        const char* parentClassName = 0;
+        const char* ourClassName = 0;
+        if (cell->structure()->structure() && cell->structure()->structure()->JSCell::classInfo())
+            parentClassName = cell->structure()->structure()->JSCell::classInfo()->className;
+        if (cell->structure()->JSCell::classInfo())
+            ourClassName = cell->structure()->JSCell::classInfo()->className;
+        dataLog("parent structure (%p <%s>) of cell at %p doesn't match cell's structure (%p <%s>)\n",
+                cell->structure()->structure(), parentClassName, cell, cell->structure(), ourClassName);
         CRASH();
+    }
 }
 #else