diff options
-rw-r--r-- | src/qml/compiler/qv4compileddata.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4function.cpp | 3 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4function_p.h | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp index 4c0bbd9dfa..e72bbe1f5e 100644 --- a/src/qml/compiler/qv4compileddata.cpp +++ b/src/qml/compiler/qv4compileddata.cpp @@ -384,7 +384,7 @@ void CompilationUnit::linkBackendToEngine(ExecutionEngine *engine) runtimeFunctions.resize(data->functionTableSize); for (int i = 0 ;i < runtimeFunctions.size(); ++i) { const QV4::CompiledData::Function *compiledFunction = data->functionAt(i); - runtimeFunctions[i] = new QV4::Function(engine, this, compiledFunction, &Moth::VME::exec); + runtimeFunctions[i] = new QV4::Function(engine, this, compiledFunction); } Scope scope(engine); diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index ed050cc094..10e7fb1b3f 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -52,10 +52,9 @@ QT_BEGIN_NAMESPACE using namespace QV4; -Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function, Code codePtr) +Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function) : compiledFunction(function) , compilationUnit(unit) - , code(codePtr) , codeData(function->code()) , jittedCode(nullptr) , codeRef(nullptr) diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h index fa6b886b10..06a3bda0a8 100644 --- a/src/qml/jsruntime/qv4function_p.h +++ b/src/qml/jsruntime/qv4function_p.h @@ -72,8 +72,6 @@ struct Q_QML_EXPORT Function { return Moth::VME::exec(this, thisObject, argv, argc, context); } - typedef ReturnedValue (*Code)(const FunctionObject *fo, const Value *thisObject, const Value *argv, int argc); - Code code; const uchar *codeData; typedef ReturnedValue (*JittedCode)(CppStackFrame *, ExecutionEngine *); @@ -86,7 +84,7 @@ struct Q_QML_EXPORT Function { int interpreterCallCount = 0; bool hasQmlDependencies; - Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function, Code codePtr); + Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function); ~Function(); // used when dynamically assigning signal handlers (QQmlConnection) diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index e95f5108a9..a9aaa344cb 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -465,7 +465,6 @@ void Heap::ScriptFunction::init(QV4::ExecutionContext *scope, Function *function setFunction(function); Q_ASSERT(function); - Q_ASSERT(function->code); Scope s(scope); ScopedFunctionObject f(s, this); |