Don't use empty values anymore to store internal freelists

Simply encode them as integers. That works just as well, and
allows removing the indexed empty values.

This is helpful, to swap the internal representations of undefined
and empty values, which in turn will simplify an implementation of
correct handling of uninitialized variables (through let/const).

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

1 files changed, 2 insertions, 26 deletions

diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index d2d19f005e..a27ae9c9a6 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -185,23 +185,7 @@ public:
 
     QML_NEARLY_ALWAYS_INLINE void setEmpty()
     {
-        setTagValue(quint32(ValueTypeInternal::Empty), value());
-    }
-
-    QML_NEARLY_ALWAYS_INLINE void setEmpty(int i)
-    {
-        setTagValue(quint32(ValueTypeInternal::Empty), quint32(i));
-    }
-
-    QML_NEARLY_ALWAYS_INLINE void setEmpty(quint32 i)
-    {
-        setTagValue(quint32(ValueTypeInternal::Empty), i);
-    }
-
-    QML_NEARLY_ALWAYS_INLINE quint32 emptyValue()
-    {
-        Q_ASSERT(isEmpty());
-        return quint32(value());
+        setTagValue(quint32(ValueTypeInternal::Empty), 0);
     }
 
     // ### Fix for 32 bit (easiest solution is to set highest bit to 1 for mananged/undefined/integercompatible
@@ -612,7 +596,6 @@ ReturnedValue Heap::Base::asReturnedValue() const
 struct Q_QML_PRIVATE_EXPORT Primitive : public Value
 {
     inline static Primitive emptyValue();
-    inline static Primitive emptyValue(uint v);
     static inline Primitive fromBoolean(bool b);
     static inline Primitive fromInt32(int i);
     inline static Primitive undefinedValue();
@@ -638,14 +621,7 @@ inline Primitive Primitive::undefinedValue()
 inline Primitive Primitive::emptyValue()
 {
     Primitive v;
-    v.setEmpty(0);
-    return v;
-}
-
-inline Primitive Primitive::emptyValue(uint e)
-{
-    Primitive v;
-    v.setEmpty(e);
+    v.setEmpty();
     return v;
 }