Changeset 39951 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.cpp

Timestamp:

Jan 15, 2009, 3:49:55 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-15 Sam Weinig <​[email protected]>

Reviewed by Gavin Barraclough.

Fix crash seen running fast/canvas.

Make sure to mark the ScopeNode and CodeBlock being created
in the re-parse for exception information.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::reparseForExceptionInfoIfNecessary):
• parser/Nodes.h: (JSC::ScopeNode::mark):
• runtime/Collector.cpp: (JSC::Heap::collect):
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• runtime/JSGlobalData.h:

File:

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

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1410 +1410 @@
             RefPtr<FunctionBodyNode> newFunctionBody = m_globalData->parser->reparse<FunctionBodyNode>(m_globalData, ownerFunctionBodyNode);
             newFunctionBody->finishParsing(ownerFunctionBodyNode->copyParameters(), ownerFunctionBodyNode->parameterCount());
+
+            m_globalData->scopeNodeBeingReparsed = newFunctionBody.get();
+
             CodeBlock& newCodeBlock = newFunctionBody->bytecodeForExceptionInfoReparse(scopeChain, this);
             ASSERT(newCodeBlock.m_exceptionInfo);
@@ -1420 +1423 @@
 
             m_exceptionInfo.set(newCodeBlock.m_exceptionInfo.release());
+
+            m_globalData->scopeNodeBeingReparsed = 0;
+
             break;
         }
@@ -1425 +1431 @@
             EvalNode* ownerEvalNode = static_cast<EvalNode*>(m_ownerNode);
             RefPtr<EvalNode> newEvalBody = m_globalData->parser->reparse<EvalNode>(m_globalData, ownerEvalNode);
+
+            m_globalData->scopeNodeBeingReparsed = newEvalBody.get();
+
             EvalCodeBlock& newCodeBlock = newEvalBody->bytecodeForExceptionInfoReparse(scopeChain, this);
             ASSERT(newCodeBlock.m_exceptionInfo);
@@ -1435 +1444 @@
 
             m_exceptionInfo.set(newCodeBlock.m_exceptionInfo.release());
+
+            m_globalData->scopeNodeBeingReparsed = 0;
+
             break;
         }