Always set the correct FunctionObject when calling JS functions

Renamed ScopedCallData to JSCall, enforced passing a JS
FunctionObject to it, and added call() and callAsConstructor()
methods to it.

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

1 files changed, 15 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4jscall_p.h b/src/qml/jsruntime/qv4jscall_p.h
index f871034789..c78337a89f 100644
--- a/src/qml/jsruntime/qv4jscall_p.h
+++ b/src/qml/jsruntime/qv4jscall_p.h
@@ -60,16 +60,15 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
-struct ScopedCallData {
-    ScopedCallData(const Scope &scope, int argc = 0)
+struct JSCall {
+    JSCall(const Scope &scope, std::nullptr_t, int argc = 0)
     {
         int size = int(offsetof(QV4::CallData, args)/sizeof(QV4::Value)) + qMax(argc , int(QV4::Global::ReservedArgumentCount));
         ptr = reinterpret_cast<CallData *>(scope.alloc(size));
         ptr->tag = quint32(QV4::Value::ValueTypeInternal::Integer);
         ptr->argc = argc;
     }
-
-    ScopedCallData(const Scope &scope, const FunctionObject *function, int argc = 0)
+    JSCall(const Scope &scope, const FunctionObject *function, int argc = 0)
     {
         int size = int(offsetof(QV4::CallData, args)/sizeof(QV4::Value)) + qMax(argc , int(QV4::Global::ReservedArgumentCount));
         ptr = reinterpret_cast<CallData *>(scope.alloc(size));
@@ -77,6 +76,14 @@ struct ScopedCallData {
         ptr->argc = argc;
         ptr->function = *function;
     }
+    JSCall(const Scope &scope, Heap::FunctionObject *function, int argc = 0)
+    {
+        int size = int(offsetof(QV4::CallData, args)/sizeof(QV4::Value)) + qMax(argc , int(QV4::Global::ReservedArgumentCount));
+        ptr = reinterpret_cast<CallData *>(scope.alloc(size));
+        ptr->tag = quint32(QV4::Value::ValueTypeInternal::Integer);
+        ptr->argc = argc;
+        ptr->function = function;
+    }
 
     CallData *operator->() {
         return ptr;
@@ -90,6 +97,10 @@ struct ScopedCallData {
         return static_cast<FunctionObject &>(ptr->function).call(ptr);
     }
 
+    ReturnedValue callAsConstructor() const {
+        return static_cast<FunctionObject &>(ptr->function).construct(ptr);
+    }
+
     CallData *ptr;
 };