summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/script/api/qscriptengine.cpp5
-rw-r--r--src/script/api/qscriptengine_p.h1
-rw-r--r--src/script/bridge/qscriptfunction.cpp1
3 files changed, 0 insertions, 7 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 3378da9..9fba7cb 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -795,7 +795,6 @@ QScriptPushScopeHelper::~QScriptPushScopeHelper()
exec->setScopeChain(exec->scopeChain()->pop());
exec->scopeChain()->deref();
engine->currentFrame = previousFrame;
- engine->releaseContextForFrame(exec);
}
} // namespace QScript
@@ -1027,9 +1026,6 @@ QScriptContext *QScriptEnginePrivate::contextForFrame(JSC::ExecState *frame)
return reinterpret_cast<QScriptContext *>(frame);
}
-void QScriptEnginePrivate::releaseContextForFrame(JSC::ExecState *frame)
-{
-}
JSC::JSGlobalObject *QScriptEnginePrivate::originalGlobalObject() const
{
@@ -2248,7 +2244,6 @@ void QScriptEngine::popContext()
JSC::RegisterFile &registerFile = d->currentFrame->interpreter()->registerFile();
JSC::Register *const newEnd = d->currentFrame->registers() - JSC::RegisterFile::CallFrameHeaderSize - d->currentFrame->argumentCount();
d->currentFrame->scopeChain()->pop()->deref();
- d->releaseContextForFrame(d->currentFrame);
d->currentFrame = d->currentFrame->callerFrame();
registerFile.shrink(newEnd);
#ifndef Q_SCRIPT_NO_EVENT_NOTIFY
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index cb56cae..614341b 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -146,7 +146,6 @@ public:
void setDefaultPrototype(int metaTypeId, JSC::JSValue prototype);
QScriptContext *contextForFrame(JSC::ExecState *frame);
- void releaseContextForFrame(JSC::ExecState *frame);
JSC::JSGlobalObject *originalGlobalObject() const;
JSC::JSObject *getOriginalGlobalObjectProxy();
diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp
index d51147a..04c1abd 100644
--- a/src/script/bridge/qscriptfunction.cpp
+++ b/src/script/bridge/qscriptfunction.cpp
@@ -142,7 +142,6 @@ JSC::JSValue FunctionWithArgWrapper::proxyCall(JSC::ExecState *exec, JSC::JSObje
{
FunctionWithArgWrapper *self = static_cast<FunctionWithArgWrapper*>(callee);
QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(self->data->engine);
- QScriptContext *ctx = eng_p->contextForFrame(exec);
//We might have nested eval inside our function so we should create another scope
QScriptPushScopeHelper scope(exec);