1 files changed, 13 insertions, 50 deletions

diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h
index 6e11d93f58..41150fd9e1 100644
--- a/src/qml/memory/qv4heap_p.h
+++ b/src/qml/memory/qv4heap_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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) 2016 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 QV4HEAP_P_H
 #define QV4HEAP_P_H
 
@@ -50,12 +14,11 @@
 // We mean it.
 //
 
-#include <QtCore/QString>
 #include <private/qv4global_p.h>
 #include <private/qv4mmdefs_p.h>
 #include <private/qv4writebarrier_p.h>
 #include <private/qv4vtable_p.h>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 
 // To check if Heap::Base::init is called (meaning, all subclasses did their init and called their
 // parent's init all up the inheritance chain), define QML_CHECK_INIT_DESTROY_CALLS below.
@@ -90,7 +53,7 @@ private:
     Base *ptr;
 };
 typedef Pointer<char *, 0> V4PointerCheck;
-Q_STATIC_ASSERT(std::is_trivial< V4PointerCheck >::value);
+Q_STATIC_ASSERT(std::is_trivial_v<V4PointerCheck>);
 
 struct Q_QML_EXPORT Base {
     void *operator new(size_t) = delete;
@@ -114,12 +77,6 @@ struct Q_QML_EXPORT Base {
         Q_ASSERT(!Chunk::testBit(c->extendsBitmap, h - c->realBase()));
         return Chunk::setBit(c->blackBitmap, h - c->realBase());
     }
-    inline void setGrayBit() {
-        const HeapItem *h = reinterpret_cast<const HeapItem *>(this);
-        Chunk *c = h->chunk();
-        Q_ASSERT(!Chunk::testBit(c->extendsBitmap, h - c->realBase()));
-        return Chunk::setBit(c->grayBitmap, h - c->realBase());
-    }
 
     inline bool inUse() const {
         const HeapItem *h = reinterpret_cast<const HeapItem *>(this);
@@ -169,7 +126,7 @@ struct Q_QML_EXPORT Base {
     Q_ALWAYS_INLINE void _setDestroyed() {}
 #endif
 };
-Q_STATIC_ASSERT(std::is_trivial< Base >::value);
+Q_STATIC_ASSERT(std::is_trivial_v<Base>);
 // This class needs to consist only of pointer sized members to allow
 // for a size/offset translation when cross-compiling between 32- and
 // 64-bit.
@@ -245,16 +202,22 @@ struct QV4QPointer {
         init(o);
         return *this;
     }
+
     bool isNull() const noexcept
     {
-        return d == nullptr || qObject == nullptr || d->strongref.loadRelaxed() == 0;
+        return !isValid() || d->strongref.loadRelaxed() == 0;
+    }
+
+    bool isValid() const noexcept
+    {
+        return d != nullptr && qObject != nullptr;
     }
 
 private:
     QtSharedPointer::ExternalRefCountData *d;
     QObject *qObject;
 };
-Q_STATIC_ASSERT(std::is_trivial< QV4QPointer<QObject> >::value);
+Q_STATIC_ASSERT(std::is_trivial_v<QV4QPointer<QObject>>);
 #endif
 
 }