diff options
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qml/ecmascripttests/TestExpectations | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 0d8fd799e6..516e9b3c65 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -549,8 +549,9 @@ void Object::advanceIterator(Managed *m, ObjectIterator *it, Value *name, uint * while (it->memberIndex < o->internalClass()->size) { Identifier n = o->internalClass()->nameMap.at(it->memberIndex); - if (!n.isValid()) { + if (!n.isValid() || !n.asHeapObject()->internalClass->vtable->isString) { // accessor properties have a dummy entry with n == 0 + // symbol entries are supposed to be skipped ++it->memberIndex; continue; } diff --git a/tests/auto/qml/ecmascripttests/TestExpectations b/tests/auto/qml/ecmascripttests/TestExpectations index f34692184e..89efd5e876 100644 --- a/tests/auto/qml/ecmascripttests/TestExpectations +++ b/tests/auto/qml/ecmascripttests/TestExpectations @@ -2393,7 +2393,6 @@ language/arguments-object/mapped/nonconfigurable-nonenumerable-nonwritable-descr language/arguments-object/mapped/nonconfigurable-nonwritable-descriptors-set-by-arguments.js sloppyFails language/arguments-object/mapped/nonconfigurable-nonwritable-descriptors-set-by-param.js sloppyFails language/arguments-object/mapped/nonwritable-nonconfigurable-descriptors-set-by-arguments.js sloppyFails -language/computed-property-names/basics/symbol.js fails language/computed-property-names/class/accessor/getter-duplicates.js fails language/computed-property-names/class/accessor/getter.js fails language/computed-property-names/class/accessor/setter-duplicates.js fails @@ -2423,7 +2422,6 @@ language/computed-property-names/class/static/setter-prototype.js fails language/computed-property-names/object/accessor/getter-super.js fails language/computed-property-names/object/accessor/setter-super.js fails language/computed-property-names/object/method/super.js fails -language/computed-property-names/object/method/symbol.js fails language/computed-property-names/to-name-side-effects/class.js fails language/computed-property-names/to-name-side-effects/numbers-class.js fails language/eval-code/direct/lex-env-distinct-cls.js fails |