1 files changed, 31 insertions, 51 deletions

diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h
index b5cfea8863..68e906baa1 100644
--- a/src/qml/jsruntime/qv4enginebase_p.h
+++ b/src/qml/jsruntime/qv4enginebase_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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) 2017 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 QV4ENGINEBASE_P_H
 #define QV4ENGINEBASE_P_H
 
@@ -60,29 +24,47 @@ namespace QV4 {
 struct CppStackFrame;
 
 // Base class for the execution engine
-
-#if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
-#pragma pack(push, 1)
-#endif
 struct Q_QML_EXPORT EngineBase {
 
     CppStackFrame *currentStackFrame = nullptr;
 
     Value *jsStackTop = nullptr;
+
+    // The JIT expects hasException and isInterrupted to be in the same 32bit word in memory.
     quint8 hasException = false;
-    quint8 writeBarrierActive = false;
+    // isInterrupted is expected to be set from a different thread
+#if defined(Q_ATOMIC_INT8_IS_SUPPORTED)
+    QAtomicInteger<quint8> isInterrupted = false;
     quint16 unused = 0;
+#elif defined(Q_ATOMIC_INT16_IS_SUPPORTED)
+    quint8 unused = 0;
+    QAtomicInteger<quint16> isInterrupted = false;
+#else
+#   error V4 needs either 8bit or 16bit atomics.
+#endif
+
     quint8 isExecutingInRegExpJIT = false;
-    quint8 padding[3];
+    quint8 isInitialized = false;
+    quint8 inShutdown = false;
+    quint8 isGCOngoing = false; // incremental gc is ongoing (but mutator might be running)
     MemoryManager *memoryManager = nullptr;
-    Runtime runtime;
 
-    qint32 callDepth = 0;
+    union {
+        const void *cppStackBase = nullptr;
+        struct {
+            qint32 callDepth;
+#if QT_POINTER_SIZE == 8
+            quint32 padding2;
+#endif
+        };
+    };
+    const void *cppStackLimit = nullptr;
+
+    Object *globalObject = nullptr;
     Value *jsStackLimit = nullptr;
     Value *jsStackBase = nullptr;
 
     IdentifierTable *identifierTable = nullptr;
-    Object *globalObject = nullptr;
 
     // Exception handling
     Value *exceptionValue = nullptr;
@@ -126,16 +108,14 @@ struct Q_QML_EXPORT EngineBase {
     Heap::InternalClass *classes[NClasses];
     Heap::InternalClass *internalClasses(InternalClassType icType) { return classes[icType]; }
 };
-#if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
-#pragma pack(pop)
-#endif
 
 Q_STATIC_ASSERT(std::is_standard_layout<EngineBase>::value);
 Q_STATIC_ASSERT(offsetof(EngineBase, currentStackFrame) == 0);
 Q_STATIC_ASSERT(offsetof(EngineBase, jsStackTop) == offsetof(EngineBase, currentStackFrame) + QT_POINTER_SIZE);
 Q_STATIC_ASSERT(offsetof(EngineBase, hasException) == offsetof(EngineBase, jsStackTop) + QT_POINTER_SIZE);
 Q_STATIC_ASSERT(offsetof(EngineBase, memoryManager) == offsetof(EngineBase, hasException) + 8);
-Q_STATIC_ASSERT(offsetof(EngineBase, runtime) == offsetof(EngineBase, memoryManager) + QT_POINTER_SIZE);
+Q_STATIC_ASSERT(offsetof(EngineBase, isInterrupted) + sizeof(EngineBase::isInterrupted) <= offsetof(EngineBase, hasException) + 4);
+Q_STATIC_ASSERT(offsetof(EngineBase, globalObject) % QT_POINTER_SIZE == 0);
 
 }