Don't create a FunctionObject in createQmlBinding()

This also removes the last use of the QmlBindingWrapper, so
remove that class as well.

Change-Id: I2ec795b6ab695a689fb24d64c9b8809b651c2b37
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

3 files changed, 2 insertions, 53 deletions

diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 25089855bb..5d7df9a9d7 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -58,44 +58,8 @@
 #include <QtCore/QDebug>
 #include <QtCore/QString>
 
-QT_BEGIN_NAMESPACE
-
-namespace QV4 {
-namespace Heap {
-
-struct QmlBindingWrapper : FunctionObject {
-    void init(QV4::QmlContext *scope, Function *f);
-};
-
-}
-
-struct QmlBindingWrapper : FunctionObject {
-    V4_OBJECT2(QmlBindingWrapper, FunctionObject)
-
-    static void call(const Managed *that, Scope &scope, CallData *callData) {
-        QV4::ScriptFunction::call(that, scope, callData);
-    }
-};
-
-}
-
-QT_END_NAMESPACE
-
 using namespace QV4;
 
-DEFINE_OBJECT_VTABLE(QmlBindingWrapper);
-
-void Heap::QmlBindingWrapper::init(QV4::QmlContext *scope, Function *f)
-{
-    Heap::FunctionObject::init(scope, scope->d()->engine->id_eval(), /*createProto = */ false);
-
-    Q_ASSERT(scope->inUse());
-
-    function = f;
-    if (function)
-        function->compilationUnit->addref();
-}
-
 Script::Script(ExecutionEngine *v4, QmlContext *qml, CompiledData::CompilationUnit *compilationUnit)
     : line(0), column(0), scope(v4->rootContext()), strictMode(false), inheritContext(true), parsed(false)
     , compilationUnit(compilationUnit), vmFunction(0), parseAsBinding(true)
@@ -280,17 +244,6 @@ QQmlRefPointer<QV4::CompiledData::CompilationUnit> Script::precompile(IR::Module
     return isel->compile(/*generate unit data*/false);
 }
 
-ReturnedValue Script::qmlBinding()
-{
-    if (!parsed)
-        parse();
-    ExecutionEngine *v4 = scope->engine();
-    Scope valueScope(v4);
-    Scoped<QmlContext> qml(valueScope, qmlContext.value());
-    ScopedObject v(valueScope, v4->memoryManager->allocObject<QmlBindingWrapper>(qml, vmFunction));
-    return v.asReturnedValue();
-}
-
 QV4::ReturnedValue Script::evaluate(ExecutionEngine *engine, const QString &script, QmlContext *qmlContext)
 {
     QV4::Scope scope(engine);
diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 686fa49c88..f96f0254a5 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -136,7 +136,6 @@ struct Q_QML_EXPORT Script {
 
     void parse();
     ReturnedValue run();
-    ReturnedValue qmlBinding();
 
     Function *function();
 
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 5c6c0a0dce..96a9f5b6b1 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -431,10 +431,7 @@ void QQmlJavaScriptExpression::createQmlBinding(QQmlContextData *ctxt, QObject *
 
     QV4::Scoped<QV4::QmlContext> qmlContext(scope, QV4::QmlContext::create(v4->rootContext(), ctxt, qmlScope));
     QV4::Script script(v4, qmlContext, code, filename, line);
-    QV4::ScopedFunctionObject result(scope);
     script.parse();
-    if (!v4->hasException)
-        result = script.qmlBinding();
     if (v4->hasException) {
         QQmlError error = v4->catchExceptionAsQmlError();
         if (error.description().isEmpty())
@@ -445,9 +442,9 @@ void QQmlJavaScriptExpression::createQmlBinding(QQmlContextData *ctxt, QObject *
             error.setUrl(QUrl::fromLocalFile(filename));
         error.setObject(qmlScope);
         ep->warning(error);
-        result = QV4::Encode::undefined();
+        return;
     }
-    setFunctionObject(result);
+    setupFunction(qmlContext, script.vmFunction);
 }
 
 void QQmlJavaScriptExpression::setFunctionObject(const QV4::FunctionObject *o)