Get rid of SimpleScriptFunction

Now that the code paths are very similar, we can simply to the
check whether to do a fast or slow function call in
ScriptFunction::call/contruct. To make this fast, cache the
result of the required check in QV4::Function

Change-Id: I03085ca2beb83b1721b60b0d7b2ab4c9266d1e48
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index 802af43cdc..54d0528c42 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -71,6 +71,7 @@ struct Q_QML_EXPORT Function {
     uint nFormals;
     bool activationRequired;
     bool hasQmlDependencies;
+    bool canUseSimpleCall;
 
     Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function,
              ReturnedValue (*codePtr)(ExecutionEngine *, const uchar *));
@@ -91,14 +92,7 @@ struct Q_QML_EXPORT Function {
     inline bool needsActivation() const
     { return activationRequired; }
 
-    inline bool canUseSimpleFunction() const {
-        if (needsActivation() ||
-            compiledFunction->flags & CompiledData::Function::HasCatchOrWith ||
-            compiledFunction->nFormals > QV4::Global::ReservedArgumentCount ||
-            isNamedExpression())
-            return false;
-        return true;
-    }
+    inline bool canUseSimpleFunction() const { return canUseSimpleCall; }
 
     QQmlSourceLocation sourceLocation() const
     {