aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4propertykey_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/jsruntime/qv4propertykey_p.h')
-rw-r--r--src/qml/jsruntime/qv4propertykey_p.h138
1 files changed, 56 insertions, 82 deletions
diff --git a/src/qml/jsruntime/qv4propertykey_p.h b/src/qml/jsruntime/qv4propertykey_p.h
index b2a2ec3dea..f3b05ee0d8 100644
--- a/src/qml/jsruntime/qv4propertykey_p.h
+++ b/src/qml/jsruntime/qv4propertykey_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef QV4PROPERTYKEY_H
#define QV4PROPERTYKEY_H
@@ -50,7 +14,10 @@
// We mean it.
//
+#include <private/qv4writebarrier_p.h>
#include <private/qv4global_p.h>
+#include <private/qv4staticvalue_p.h>
+#include <QtCore/qhashfunctions.h>
QT_BEGIN_NAMESPACE
@@ -71,68 +38,74 @@ private:
// * If the key is a Symbol it simply points to the referenced symbol object
// * if the key is an array index (a uint < UINT_MAX), it's encoded as an
// integer value
- quint64 val;
+ QV4::StaticValue val;
- // Important: Always keep this in sync with the definitions for Integers and heap objects in Value
- static const quint64 ArrayIndexMask = 0x3800000000000ull;
- enum {
- IsManagedOrUndefined_Shift = 64-15,
- };
- inline bool isManaged() const { return (val >> IsManagedOrUndefined_Shift) == 0; }
- inline quint32 value() const { return val & quint64(~quint32(0)); }
+ inline bool isManaged() const { return val.isManaged(); }
+ inline quint32 value() const { return val.value(); }
-#if QT_POINTER_SIZE == 8
- QML_NEARLY_ALWAYS_INLINE Heap::StringOrSymbol *m() const
+public:
+ static PropertyKey invalid()
{
- Heap::StringOrSymbol *b;
- memcpy(&b, &val, 8);
- return b;
+ PropertyKey key;
+ key.val = StaticValue::undefinedValue();
+ return key;
}
- QML_NEARLY_ALWAYS_INLINE void setM(Heap::StringOrSymbol *b)
+
+ static PropertyKey fromArrayIndex(uint idx)
{
- memcpy(&val, &b, 8);
+ PropertyKey key;
+ key.val.setInt_32(idx);
+ return key;
}
-#elif QT_POINTER_SIZE == 4
- QML_NEARLY_ALWAYS_INLINE Heap::StringOrSymbol *m() const
+
+ bool isStringOrSymbol() const { return isManaged(); }
+ uint asArrayIndex() const
{
- Q_STATIC_ASSERT(sizeof(Heap::StringOrSymbol*) == sizeof(quint32));
- Heap::StringOrSymbol *b;
- quint32 v = value();
- memcpy(&b, &v, 4);
- return b;
+ Q_ASSERT(isArrayIndex());
+ return value();
}
- QML_NEARLY_ALWAYS_INLINE void setM(Heap::StringOrSymbol *b)
+
+ bool isArrayIndex() const { return val.isInteger(); }
+ bool isValid() const { return !val.isUndefined(); }
+
+ // We cannot #include the declaration of Heap::StringOrSymbol here.
+ // Therefore we do some gymnastics to enforce the type safety.
+
+ template<typename StringOrSymbol = Heap::StringOrSymbol, typename Engine = QV4::EngineBase>
+ static PropertyKey fromStringOrSymbol(Engine *engine, StringOrSymbol *b)
{
- quint32 v;
- memcpy(&v, &b, 4);
- val = v;
+ static_assert(std::is_base_of_v<Heap::StringOrSymbol, StringOrSymbol>);
+ PropertyKey key;
+ QV4::WriteBarrier::markCustom(engine, [&](QV4::MarkStack *stack) {
+ if constexpr (QV4::WriteBarrier::isInsertionBarrier) {
+ // treat this as an insertion - the StringOrSymbol becomes reachable
+ // via the propertykey, so we consequently need to mark it durnig gc
+ b->mark(stack);
+ }
+ });
+ key.val.setM(b);
+ Q_ASSERT(key.isManaged());
+ return key;
}
-#endif
-public:
- static PropertyKey invalid() { PropertyKey key; key.val = 0; return key; }
- static PropertyKey fromArrayIndex(uint idx) { PropertyKey key; key.val = ArrayIndexMask | static_cast<quint64>(idx); return key; }
- bool isStringOrSymbol() const { return isManaged() && val != 0; }
- uint asArrayIndex() const { Q_ASSERT(isArrayIndex()); return static_cast<uint>(val & 0xffffffff); }
- uint isArrayIndex() const { return !isManaged() && val != 0; }
- bool isValid() const { return val != 0; }
- static PropertyKey fromStringOrSymbol(Heap::StringOrSymbol *b)
- { PropertyKey key; key.setM(b); return key; }
- Heap::StringOrSymbol *asStringOrSymbol() const {
+ template<typename StringOrSymbol = Heap::StringOrSymbol>
+ StringOrSymbol *asStringOrSymbol() const
+ {
+ static_assert(std::is_base_of_v<Heap::StringOrSymbol, StringOrSymbol>);
if (!isManaged())
return nullptr;
- return m();
+ return static_cast<StringOrSymbol *>(val.m());
}
Q_QML_EXPORT bool isString() const;
- bool isSymbol() const;
+ Q_QML_EXPORT bool isSymbol() const;
bool isCanonicalNumericIndexString() const;
Q_QML_EXPORT QString toQString() const;
Heap::StringOrSymbol *toStringOrSymbol(ExecutionEngine *e);
- quint64 id() const { return val; }
+ quint64 id() const { return val._val; }
static PropertyKey fromId(quint64 id) {
- PropertyKey key; key.val = id; return key;
+ PropertyKey key; key.val._val = id; return key;
}
enum FunctionNamePrefix {
@@ -142,9 +115,10 @@ public:
};
Heap::String *asFunctionName(ExecutionEngine *e, FunctionNamePrefix prefix) const;
- bool operator ==(const PropertyKey &other) const { return val == other.val; }
- bool operator !=(const PropertyKey &other) const { return val != other.val; }
- bool operator <(const PropertyKey &other) const { return val < other.val; }
+ bool operator ==(const PropertyKey &other) const { return val._val == other.val._val; }
+ bool operator !=(const PropertyKey &other) const { return val._val != other.val._val; }
+ bool operator <(const PropertyKey &other) const { return val._val < other.val._val; }
+ friend size_t qHash(const PropertyKey &key, size_t seed = 0) { return qHash(key.val._val, seed); }
};
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 18:17:46 +0000