From 9eb51ca0b26fc17c62b06211728f609863113a42 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 28 Aug 2018 16:59:16 +0200 Subject: Fix remaining test failures for Array.isArray Change-Id: I6258cae2933392c260ce4c4d7f90a2838d91cd51 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4arrayobject.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/qml/jsruntime/qv4arrayobject.cpp') diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index c162a38e9d..042d296276 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -49,6 +49,7 @@ #include "qv4string_p.h" #include "qv4symbol_p.h" #include +#include "qv4proxy_p.h" using namespace QV4; @@ -157,11 +158,12 @@ void ArrayPrototype::init(ExecutionEngine *engine, Object *ctor) ReturnedValue ArrayPrototype::method_isArray(const FunctionObject *, const Value *, const Value *argv, int argc) { - bool isArray = argc && argv[0].as(); - return Encode(isArray); + if (!argc || !argv->objectValue()) + return Encode(false); + return Encode(argv->objectValue()->isArray()); } -ScopedObject createObjectFromCtorOrArray(Scope &scope, ScopedFunctionObject ctor, bool useLen, int len) +static ScopedObject createObjectFromCtorOrArray(Scope &scope, ScopedFunctionObject ctor, bool useLen, int len) { ScopedObject a(scope, Primitive::undefinedValue()); -- cgit v1.2.3