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, 6 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 187cd7c313..f09d803d0b 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -424,12 +424,13 @@ ReturnedValue RuntimeHelpers::objectDefaultValue(const Object *object, int typeH
         qSwap(meth1, meth2);
 
     Scope scope(engine);
-    ScopedCallData callData(scope, 0);
-    callData->thisObject = *object;
+    JSCall jsCall(scope, nullptr, 0);
+    jsCall->thisObject = *object;
 
     ScopedValue conv(scope, object->get(meth1));
     if (FunctionObject *o = conv->as<FunctionObject>()) {
-        ScopedValue r(scope, o->call(callData));
+        jsCall->function = o;
+        ScopedValue r(scope, jsCall.call());
         if (r->isPrimitive())
             return r->asReturnedValue();
     }
@@ -439,7 +440,8 @@ ReturnedValue RuntimeHelpers::objectDefaultValue(const Object *object, int typeH
 
     conv = object->get(meth2);
     if (FunctionObject *o = conv->as<FunctionObject>()) {
-        ScopedValue r(scope, o->call(callData));
+        jsCall->function = o;
+        ScopedValue r(scope, jsCall.call());
         if (r->isPrimitive())
             return r->asReturnedValue();
     }