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, 12 insertions, 7 deletions

diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index e34ee0ccbe..b6f2e837ba 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -667,30 +667,35 @@ struct Encode {
         return Primitive::nullValue().rawValue();
     }
 
-    Encode(bool b) {
+    explicit Encode(bool b) {
         val = Primitive::fromBoolean(b).rawValue();
     }
-    Encode(double d) {
+    explicit Encode(double d) {
         val = Primitive::fromDouble(d).rawValue();
     }
-    Encode(int i) {
+    explicit Encode(int i) {
         val = Primitive::fromInt32(i).rawValue();
     }
-    Encode(uint i) {
+    explicit Encode(uint i) {
         val = Primitive::fromUInt32(i).rawValue();
     }
-    Encode(ReturnedValue v) {
+    explicit Encode(ReturnedValue v) {
         val = v;
     }
     Encode(Value v) {
         val = v.rawValue();
     }
 
-    Encode(Heap::Base *o) {
+    explicit Encode(Heap::Base *o) {
         Q_ASSERT(o);
         val = Value::fromHeapObject(o).asReturnedValue();
     }
 
+    explicit Encode(Value *o) {
+        Q_ASSERT(o);
+        val = o->asReturnedValue();
+    }
+
     static ReturnedValue smallestNumber(double d) {
         if (static_cast<int>(d) == d && !(d == 0. && std::signbit(d)))
             return Encode(static_cast<int>(d));
@@ -703,7 +708,7 @@ struct Encode {
     }
     quint64 val;
 private:
-    Encode(void *);
+    explicit Encode(void *);
 };
 
 template<typename T>