Get rid of the compilation unit related members in ExecutionContext

And change the signature for VME::exec to take the QV4::Function
that should be executed. This is in preparation to being able
to run functions that will not need to allocate an execution
context on their own.

Change-Id: I34538a8723006f4ec24583805e88a66e750100c3
Reviewed-by: Erik Verbruggen <[email protected]>

1 files changed, 2 insertions, 13 deletions

diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 9fd05aad38..b1fb017f99 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -71,10 +71,6 @@ Heap::CallContext *ExecutionContext::newCallContext(Function *function, CallData
     c->strictMode = function->isStrict();
     c->outer.set(v4, this->d());
 
-    c->compilationUnit = function->compilationUnit;
-    c->lookups = function->compilationUnit->runtimeLookups;
-    c->constantTable = function->compilationUnit->constants;
-
     const CompiledData::Function *compiledFunction = function->compiledFunction;
     uint nLocals = compiledFunction->nLocals;
     c->locals.size = nLocals;
@@ -102,9 +98,7 @@ Heap::ExecutionContext *ExecutionContext::newWithContext(Heap::Object *with)
     c->activation.set(engine(), with);
 
     c->callData = d()->callData;
-    c->lookups = d()->lookups;
-    c->constantTable = d()->constantTable;
-    c->compilationUnit = d()->compilationUnit;
+    c->v4Function = d()->v4Function;
 
     return c;
 }
@@ -167,9 +161,7 @@ void Heap::CatchContext::init(ExecutionContext *outerContext, String *exceptionV
     outer.set(internalClass->engine, outerContext);
     strictMode = outer->strictMode;
     callData = outer->callData;
-    lookups = outer->lookups;
-    constantTable = outer->constantTable;
-    compilationUnit = outer->compilationUnit;
+    v4Function = outer->v4Function;
 
     this->exceptionVarName.set(internalClass->engine, exceptionVarName);
     this->exceptionValue.set(internalClass->engine, exceptionValue);
@@ -267,9 +259,6 @@ void QV4::ExecutionContext::simpleCall(Scope &scope, CallData *callData, Functio
     ctx->strictMode = function->isStrict();
     ctx->callData = callData;
     ctx->v4Function = function;
-    ctx->compilationUnit = function->compilationUnit;
-    ctx->lookups = function->compilationUnit->runtimeLookups;
-    ctx->constantTable = function->compilationUnit->constants;
     ctx->outer.set(scope.engine, this->d());
     for (int i = callData->argc; i < (int)function->nFormals; ++i)
         callData->args[i] = Encode::undefined();