diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-05 09:42:17 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-05 09:42:17 (GMT) |
| commit | 200afdbd684bc7b6dca96d6fccb59d4cd078a02e (patch) | |
| tree | c8b87ce527f9270a7773f44525208c60931a5759 /src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp | |
| parent | 226baa99f53eeeff2489148c9187c19f5bc86f0e (diff) | |
| parent | 5eef8717c9862befe8b6529cbb111c0b30529f48 (diff) | |
| download | Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.zip Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.tar.gz Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp index 91fb1c0..9207c8a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp @@ -1397,6 +1397,7 @@ void CodeBlock::reparseForExceptionInfoIfNecessary(CallFrame* callFrame) case FunctionCode: { FunctionBodyNode* ownerFunctionBodyNode = static_cast<FunctionBodyNode*>(m_ownerNode); RefPtr<FunctionBodyNode> newFunctionBody = m_globalData->parser->reparse<FunctionBodyNode>(m_globalData, ownerFunctionBodyNode); + ASSERT(newFunctionBody); newFunctionBody->finishParsing(ownerFunctionBodyNode->copyParameters(), ownerFunctionBodyNode->parameterCount()); CodeBlock& newCodeBlock = newFunctionBody->bytecodeForExceptionInfoReparse(scopeChain); ASSERT(newCodeBlock.m_exceptionInfo); |