Implement a virtual interface for getOwnProperty

This is required to support Proxy properly, and at the
same time fixes a couple of test failures.

The new interface also replaces the old query and
queryIndexed virtual interfaces, as those where doing
a subset of what getOwnProperty does.

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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp
index 58951d043c..3fa680bfef 100644
--- a/src/qml/jsruntime/qv4argumentsobject.cpp
+++ b/src/qml/jsruntime/qv4argumentsobject.cpp
@@ -202,19 +202,19 @@ bool ArgumentsObject::deleteIndexedProperty(Managed *m, uint index)
     return Object::deleteIndexedProperty(m, index);
 }
 
-PropertyAttributes ArgumentsObject::queryIndexed(const Managed *m, uint index)
+PropertyAttributes ArgumentsObject::getOwnProperty(Managed *m, Identifier id, Property *p)
 {
     const ArgumentsObject *args = static_cast<const ArgumentsObject *>(m);
-    if (args->fullyCreated())
-        return Object::queryIndexed(m, index);
+    if (!id.isArrayIndex() || args->fullyCreated())
+        return Object::getOwnProperty(m, id, p);
 
-    uint numAccessors = qMin(args->d()->nFormals, args->context()->argc());
+    uint index = id.asArrayIndex();
     uint argCount = args->context()->argc();
     if (index >= argCount)
         return PropertyAttributes();
-    if (index >= numAccessors)
-        return Attr_Data;
-    return Attr_Accessor;
+    if (p)
+        p->value = args->context()->args()[index];
+    return Attr_Data;
 }
 
 DEFINE_OBJECT_VTABLE(ArgumentsGetterFunction);