Fix incorrect implementation of Array.toString()

The spec says we need to call join with empty arguments if it's
callable, otherwise fall back to Object.toString()

Change-Id: I36aed164b60fad89b7d23b8a6993964c344a9ed3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index c316a3196e..60e7afdaec 100644
--- a/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@ -41,6 +41,7 @@
 
 #include "qv4arrayobject_p.h"
 #include "qv4sparsearray_p.h"
+#include "qv4objectproto_p.h"
 
 using namespace QV4;
 
@@ -133,7 +134,14 @@ Value ArrayPrototype::method_isArray(SimpleCallContext *ctx)
 
 Value ArrayPrototype::method_toString(SimpleCallContext *ctx)
 {
-    return method_join(ctx);
+    QV4::Object *o = ctx->thisObject.toObject(ctx);
+    FunctionObject *f = o->get(ctx->engine->newString("join")).asFunctionObject();
+    if (f) {
+        CALLDATA(0);
+        d.thisObject = ctx->thisObject;
+        return f->call(d);
+    }
+    return ObjectPrototype::method_toString(ctx);
 }
 
 Value ArrayPrototype::method_toLocaleString(SimpleCallContext *ctx)