Refactor deletion of properties

In line with the previous commit, allow entries with a valid
PropertyKey, but invalid attributes in the InternalClass. Those
entries mark a deleted property.

This cleans up/unifies some of the code in the internal class
implementation and allows re-using the slot if a deleted property
gets added again.

Change-Id: I1bada697486e3cafce7689bae87b7f884200dd99
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index b6446d39d1..ea374e43c0 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -364,18 +364,17 @@ PropertyKey ObjectOwnPropertyKeyIterator::next(const Object *o, Property *pd, Pr
         while (memberIndex < o->internalClass()->size) {
             PropertyKey n = o->internalClass()->nameMap.at(memberIndex);
             ++memberIndex;
-            if (!n.isStringOrSymbol()) {
+            if (!n.isStringOrSymbol())
                 // accessor properties have a dummy entry with n == 0
                 continue;
-            }
-            if (!iterateOverSymbols && n.isSymbol()) {
+            if (!iterateOverSymbols && n.isSymbol())
                 continue;
-            }
-            if (iterateOverSymbols && !n.isSymbol()) {
+            if (iterateOverSymbols && !n.isSymbol())
                 continue;
-            }
 
             InternalClassEntry e = o->internalClass()->find(n);
+            if (!e.isValid())
+                continue;
             if (pd) {
                 pd->value = *o->propertyData(e.index);
                 if (e.attributes.isAccessor())