From a6d04e59acc216ce2406d4cbd109d8d2e12a04ce Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Mon, 9 Nov 2009 17:48:03 +1000 Subject: Revert unneeded differences to Qt 4.6. --- .../JavaScriptCore/runtime/Executable.cpp | 20 +++++++------------- .../JavaScriptCore/runtime/Executable.h | 1 - 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.cpp index 2457e71..7586746 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.cpp @@ -59,8 +59,13 @@ FunctionExecutable::~FunctionExecutable() delete m_codeBlock; } -void EvalExecutable::compile(ExecState*exec, RefPtr &evalNode, ScopeChainNode* scopeChainNode) +JSObject* EvalExecutable::compile(ExecState* exec, ScopeChainNode* scopeChainNode) { + int errLine; + UString errMsg; + RefPtr evalNode = exec->globalData().parser->parse(&exec->globalData(), exec->lexicalGlobalObject()->debugger(), exec, m_source, &errLine, &errMsg); + if (!evalNode) + return Error::create(exec, SyntaxError, errMsg, errLine, m_source.provider()->asID(), m_source.provider()->url()); recordParse(evalNode->features(), evalNode->lineNo(), evalNode->lastLine()); ScopeChain scopeChain(scopeChainNode); @@ -70,18 +75,7 @@ void EvalExecutable::compile(ExecState*exec, RefPtr &evalNode, ScopeCh m_evalCodeBlock = new EvalCodeBlock(this, globalObject, source().provider(), scopeChain.localDepth()); OwnPtr generator(new BytecodeGenerator(evalNode.get(), globalObject->debugger(), scopeChain, m_evalCodeBlock->symbolTable(), m_evalCodeBlock)); generator->generate(); -} - -JSObject* EvalExecutable::compile(ExecState* exec, ScopeChainNode* scopeChainNode) -{ - int errLine; - UString errMsg; - RefPtr evalNode = exec->globalData().parser->parse(&exec->globalData(), exec->lexicalGlobalObject()->debugger(), exec, m_source, &errLine, &errMsg); - if (!evalNode) - return Error::create(exec, SyntaxError, errMsg, errLine, m_source.provider()->asID(), m_source.provider()->url()); - - compile(exec, evalNode, scopeChainNode); - + evalNode->destroyData(); return 0; } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h index 92eb5dc..76764f9 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h @@ -176,7 +176,6 @@ namespace JSC { } JSObject* compile(ExecState*, ScopeChainNode*); - void compile(ExecState*, RefPtr &, ScopeChainNode*); ExceptionInfo* reparseExceptionInfo(JSGlobalData*, ScopeChainNode*, CodeBlock*); static PassRefPtr create(ExecState* exec, const SourceCode& source) { return adoptRef(new EvalExecutable(exec, source)); } -- cgit v0.12