1 files changed, 11 insertions, 12 deletions
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index eeb041ddc0..2fc36d862f 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -139,7 +139,7 @@ struct Q_QML_EXPORT FunctionObject: Object {
 protected:
     FunctionObject(InternalClass *ic);
 
-    static void markObjects(Managed *that);
+    static void markObjects(Managed *that, ExecutionEngine *e);
     static bool hasInstance(Managed *that, const ValueRef value);
     static void destroy(Managed *that)
     { static_cast<FunctionObject*>(that)->~FunctionObject(); }
@@ -164,17 +164,17 @@ struct FunctionPrototype: FunctionObject
     FunctionPrototype(InternalClass *ic);
     void init(ExecutionEngine *engine, ObjectRef ctor);
 
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_apply(SimpleCallContext *ctx);
-    static ReturnedValue method_call(SimpleCallContext *ctx);
-    static ReturnedValue method_bind(SimpleCallContext *ctx);
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_apply(CallContext *ctx);
+    static ReturnedValue method_call(CallContext *ctx);
+    static ReturnedValue method_bind(CallContext *ctx);
 };
 
 struct BuiltinFunction: FunctionObject {
     Q_MANAGED
-    ReturnedValue (*code)(SimpleCallContext *);
+    ReturnedValue (*code)(CallContext *);
 
-    BuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(SimpleCallContext *));
+    BuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(CallContext *));
 
     static ReturnedValue construct(Managed *, CallData *);
     static ReturnedValue call(Managed *that, CallData *callData);
@@ -184,10 +184,10 @@ struct IndexedBuiltinFunction: FunctionObject
 {
     Q_MANAGED
 
-    ReturnedValue (*code)(SimpleCallContext *ctx, uint index);
+    ReturnedValue (*code)(CallContext *ctx, uint index);
     uint index;
 
-    IndexedBuiltinFunction(ExecutionContext *scope, uint index, ReturnedValue (*code)(SimpleCallContext *ctx, uint index))
+    IndexedBuiltinFunction(ExecutionContext *scope, uint index, ReturnedValue (*code)(CallContext *ctx, uint index))
         : FunctionObject(scope)
         , code(code)
         , index(index)
@@ -197,8 +197,7 @@ struct IndexedBuiltinFunction: FunctionObject
 
     static ReturnedValue construct(Managed *m, CallData *)
     {
-        m->engine()->current->throwTypeError();
-        return Encode::undefined();
+        return m->engine()->current->throwTypeError();
     }
 
     static ReturnedValue call(Managed *that, CallData *callData);
@@ -235,7 +234,7 @@ struct BoundFunction: FunctionObject {
     static ReturnedValue call(Managed *that, CallData *dd);
 
     static void destroy(Managed *);
-    static void markObjects(Managed *that);
+    static void markObjects(Managed *that, ExecutionEngine *e);
     static bool hasInstance(Managed *that, const ValueRef value);
 };