Remove Scope::result and convert calling convention for builtins

Allow for faster calling of builtins, and completely avoid
scope creation in many cases.

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

1 files changed, 27 insertions, 27 deletions

diff --git a/src/qml/jsruntime/qv4objectproto_p.h b/src/qml/jsruntime/qv4objectproto_p.h
index d1383df192..c3c63de8ce 100644
--- a/src/qml/jsruntime/qv4objectproto_p.h
+++ b/src/qml/jsruntime/qv4objectproto_p.h
@@ -78,33 +78,33 @@ struct ObjectPrototype: Object
 {
     void init(ExecutionEngine *engine, Object *ctor);
 
-    static void method_getPrototypeOf(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_getOwnPropertyDescriptor(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_getOwnPropertyNames(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_assign(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_create(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_defineProperty(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_defineProperties(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_seal(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_freeze(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_preventExtensions(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_isSealed(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_isFrozen(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_isExtensible(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_keys(const BuiltinFunction *, Scope &scope, CallData *callData);
-
-    static void method_toString(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_toLocaleString(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_valueOf(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_hasOwnProperty(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_isPrototypeOf(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_propertyIsEnumerable(const BuiltinFunction *, Scope &scope, CallData *callData);
-
-    static void method_defineGetter(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_defineSetter(const BuiltinFunction *, Scope &scope, CallData *callData);
-
-    static void method_get_proto(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_set_proto(const BuiltinFunction *, Scope &scope, CallData *callData);
+    static ReturnedValue method_getPrototypeOf(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_getOwnPropertyDescriptor(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_getOwnPropertyNames(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_assign(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_create(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_defineProperty(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_defineProperties(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_seal(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_freeze(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_preventExtensions(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_isSealed(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_isFrozen(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_isExtensible(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_keys(const BuiltinFunction *, CallData *callData);
+
+    static ReturnedValue method_toString(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_toLocaleString(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_valueOf(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_hasOwnProperty(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_isPrototypeOf(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_propertyIsEnumerable(const BuiltinFunction *, CallData *callData);
+
+    static ReturnedValue method_defineGetter(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_defineSetter(const BuiltinFunction *, CallData *callData);
+
+    static ReturnedValue method_get_proto(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_set_proto(const BuiltinFunction *, CallData *callData);
 
     static void toPropertyDescriptor(ExecutionEngine *engine, const Value &v, Property *desc, PropertyAttributes *attrs);
     static ReturnedValue fromPropertyDescriptor(ExecutionEngine *engine, const Property *desc, PropertyAttributes attrs);