4 files changed, 3 insertions, 17 deletions
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index c3b21b1685..f0e325ec3a 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -63,11 +63,8 @@ struct Q_QML_EXPORT Function {
     const CompiledData::Function *compiledFunction;
     CompiledData::CompilationUnit *compilationUnit;
 
-    ReturnedValue execute(CallData *callData) {
-        return code(callData, this);
-    }
     ReturnedValue call(CallData *callData) {
-        return call(callData, this);
+        return code(callData, this);
     }
 
 
@@ -102,12 +99,6 @@ struct Q_QML_EXPORT Function {
     {
         return QQmlSourceLocation(sourceFile(), compiledFunction->location.line, compiledFunction->location.column);
     }
-
-private:
-    static ReturnedValue call(CallData *callData, Function *function)
-    {
-        return function->execute(callData);
-    }
 };
 
 
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index 08963f18b4..401c267898 100644
--- a/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@ -355,14 +355,11 @@ DEFINE_OBJECT_VTABLE(ScriptFunction);
 ReturnedValue ScriptFunction::construct(const Managed *that, CallData *callData)
 {
     ExecutionEngine *v4 = that->engine();
-    if (Q_UNLIKELY(v4->hasException))
-        return Encode::undefined();
     CHECK_STACK_LIMITS(v4);
 
     const ScriptFunction *f = static_cast<const ScriptFunction *>(that);
 
     InternalClass *ic = f->classForConstructor();
-    Scope scope(v4);
     callData->thisObject = v4->memoryManager->allocObject<Object>(ic);
 
     QV4::Function *v4Function = f->function();
@@ -381,8 +378,6 @@ ReturnedValue ScriptFunction::construct(const Managed *that, CallData *callData)
 ReturnedValue ScriptFunction::call(const Managed *that, CallData *callData)
 {
     ExecutionEngine *v4 = that->engine();
-    if (Q_UNLIKELY(v4->hasException))
-        return Encode::undefined();
     CHECK_STACK_LIMITS(v4);
 
     const ScriptFunction *f = static_cast<const ScriptFunction *>(that);
diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index 44fc4d5a65..c4f52758dd 100644
--- a/src/qml/jsruntime/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
@@ -389,7 +389,7 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) const
     ScopedCallData cData(scope);
     cData->thisObject = scope.engine->currentStackFrame->thisObject();
     cData->context = *ctx;
-    return function->execute(cData);
+    return function->call(cData);
 }
 
 
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index a0aa1b1f2d..59d418a6d3 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -154,7 +154,7 @@ ReturnedValue Script::run()
         QV4::ScopedCallData cData(scope);
         cData->thisObject = engine->globalObject;
         cData->context = *scope;
-        return vmFunction->execute(cData);
+        return vmFunction->call(cData);
     } else {
         Scoped<QmlContext> qml(valueScope, qmlContext.value());
         ScopedCallData callData(valueScope);