Changeset 93238 in webkit for trunk/Source/JavaScriptCore/bytecode

Timestamp:

Aug 17, 2011, 1:54:32 PM (14 years ago)

Author:

[email protected]

Message:

JSC verbose debugging output sometimes doesn't work as expected.
​https://bugs.webkit.org/show_bug.cgi?id=66107

Reviewed by Gavin Barraclough.

Hardened the CodeBlock::dump() code so that it no longer crashes. Improved
the DFG verbose code so that it prints slightly more useful information.

• assembler/LinkBuffer.h:

(JSC::LinkBuffer::debugSize):

• bytecode/CodeBlock.cpp:

(JSC::valueToSourceString):
(JSC::CodeBlock::dump):

• bytecode/CodeBlock.h:

(JSC::CodeBlock::numberOfRegExps):

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::link):

Location:

trunk/Source/JavaScriptCore/bytecode

Files:

• CodeBlock.cpp (modified) (2 diffs)
• CodeBlock.h (modified) (1 diff)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -77 +77 @@
         return makeUString("\"", escapeQuotes(val.toString(exec)), "\"");
 
-    return val.toString(exec);
+    return val.description();
 }
 
@@ -543 +543 @@
             int r0 = (++it)->u.operand;
             int re0 = (++it)->u.operand;
-            printf("[%4d] new_regexp\t %s, %s\n", location, registerName(exec, r0).data(), regexpName(re0, regexp(re0)).data());
+            printf("[%4d] new_regexp\t %s, ", location, registerName(exec, r0).data());
+            if (r0 >=0 && r0 < (int)numberOfRegExps())
+                printf("%s\n", regexpName(re0, regexp(re0)).data());
+            else
+                printf("bad_regexp(%d)\n", re0);
             break;
         }

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -472 +472 @@
             return size;
         }
+        unsigned numberOfRegExps() const
+        {
+            if (!m_rareData)
+                return 0;
+            return m_rareData->m_regexps.size();
+        }
         RegExp* regexp(int index) const { ASSERT(m_rareData); return m_rareData->m_regexps[index].get(); }