Changeset 153671 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

Timestamp:

Aug 2, 2013, 2:50:56 PM (12 years ago)

Author:

[email protected]

Message:

DFG validation can cause assertion failures due to dumping
​https://bugs.webkit.org/show_bug.cgi?id=119456

Reviewed by Geoffrey Garen.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::hasHash):
(JSC::CodeBlock::isSafeToComputeHash):
(JSC::CodeBlock::hash):
(JSC::CodeBlock::dumpAssumingJITType):

• bytecode/CodeBlock.h:

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -84 +84 @@
 }
 
+bool CodeBlock::hasHash() const
+{
+    return !!m_hash;
+}
+
+bool CodeBlock::isSafeToComputeHash() const
+{
+    return !isCompilationThread();
+}
+
 CodeBlockHash CodeBlock::hash() const
 {
     if (!m_hash) {
-        RELEASE_ASSERT(!isCompilationThread());
+        RELEASE_ASSERT(isSafeToComputeHash());
         m_hash = CodeBlockHash(ownerExecutable()->source(), specializationKind());
     }
@@ -118 +128 @@
 void CodeBlock::dumpAssumingJITType(PrintStream& out, JITCode::JITType jitType) const
 {
-    out.print(inferredName(), "#", hash(), ":[", RawPointer(this), "->", RawPointer(ownerExecutable()), ", ", jitType, codeType());
+    if (hasHash() || isSafeToComputeHash())
+        out.print(inferredName(), "#", hash(), ":[", RawPointer(this), "->", RawPointer(ownerExecutable()), ", ", jitType, codeType());
+    else
+        out.print(inferredName(), "#<no-hash>:[", RawPointer(this), "->", RawPointer(ownerExecutable()), ", ", jitType, codeType());
+
     if (codeType() == FunctionCode)
         out.print(specializationKind());