3 files changed, 25 insertions, 8 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 7bf2a4d004..1bfd72227f 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -490,7 +490,7 @@ void QJSEngine::setInterrupted(bool interrupted)
 */
 bool QJSEngine::isInterrupted() const
 {
-    return m_v4Engine->isInterrupted;
+    return m_v4Engine->isInterrupted.loadAcquire();
 }
 
 static QUrl urlForFileName(const QString &fileName)
@@ -550,7 +550,7 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in
         result = script.run();
     if (scope.engine->hasException)
         result = v4->catchException();
-    if (v4->isInterrupted)
+    if (v4->isInterrupted.loadAcquire())
         result = v4->newErrorObject(QStringLiteral("Interrupted"));
 
     QJSValue retval(v4, result->asReturnedValue());
@@ -590,7 +590,7 @@ QJSValue QJSEngine::importModule(const QString &fileName)
     if (m_v4Engine->hasException)
         return QJSValue(m_v4Engine, m_v4Engine->catchException());
     moduleUnit->evaluate();
-    if (!m_v4Engine->isInterrupted)
+    if (!m_v4Engine->isInterrupted.loadAcquire())
         return QJSValue(m_v4Engine, moduleNamespace->asReturnedValue());
 
     return QJSValue(
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 92eaf1d8ee..c2957dd294 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -769,7 +769,7 @@ QJSValue QJSValue::call(const QJSValueList &args)
     ScopedValue result(scope, f->call(jsCallData));
     if (engine->hasException)
         result = engine->catchException();
-    if (engine->isInterrupted)
+    if (engine->isInterrupted.loadAcquire())
         result = engine->newErrorObject(QStringLiteral("Interrupted"));
 
     return QJSValue(engine, result->asReturnedValue());
@@ -827,7 +827,7 @@ QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList
     ScopedValue result(scope, f->call(jsCallData));
     if (engine->hasException)
         result = engine->catchException();
-    if (engine->isInterrupted)
+    if (engine->isInterrupted.loadAcquire())
         result = engine->newErrorObject(QStringLiteral("Interrupted"));
 
     return QJSValue(engine, result->asReturnedValue());
@@ -877,7 +877,7 @@ QJSValue QJSValue::callAsConstructor(const QJSValueList &args)
     ScopedValue result(scope, f->callAsConstructor(jsCallData));
     if (engine->hasException)
         result = engine->catchException();
-    if (engine->isInterrupted)
+    if (engine->isInterrupted.loadAcquire())
         result = engine->newErrorObject(QStringLiteral("Interrupted"));
 
     return QJSValue(engine, result->asReturnedValue());
diff --git a/src/qml/jsapi/qjsvalue_p.h b/src/qml/jsapi/qjsvalue_p.h
index bcf0a9d12d..2faffffbae 100644
--- a/src/qml/jsapi/qjsvalue_p.h
+++ b/src/qml/jsapi/qjsvalue_p.h
@@ -60,6 +60,8 @@
 #include <private/qv4mm_p.h>
 #include <private/qv4persistent_p.h>
 
+#include <QtCore/qthread.h>
+
 QT_BEGIN_NAMESPACE
 
 class Q_AUTOTEST_EXPORT QJSValuePrivate
@@ -79,6 +81,11 @@ public:
         return nullptr;
     }
 
+    static inline void setRawValue(QJSValue *jsval, QV4::Value *v)
+    {
+        jsval->d = reinterpret_cast<quintptr>(v);
+    }
+
     static inline void setVariant(QJSValue *jsval, const QVariant &v) {
         QVariant *val = new QVariant(v);
         jsval->d = reinterpret_cast<quintptr>(val) | 1;
@@ -169,10 +176,20 @@ public:
     }
 
     static inline void free(QJSValue *jsval) {
-        if (QV4::Value *v = QJSValuePrivate::getValue(jsval))
+        if (QV4::Value *v = QJSValuePrivate::getValue(jsval)) {
+            if (QV4::ExecutionEngine *e = engine(jsval)) {
+                if (QJSEngine *jsEngine = e->jsEngine()) {
+                    if (jsEngine->thread() != QThread::currentThread()) {
+                        QMetaObject::invokeMethod(
+                                jsEngine, [v](){ QV4::PersistentValueStorage::free(v); });
+                        return;
+                    }
+                }
+            }
             QV4::PersistentValueStorage::free(v);
-        else if (QVariant *v = QJSValuePrivate::getVariant(jsval))
+        } else if (QVariant *v = QJSValuePrivate::getVariant(jsval)) {
             delete v;
+        }
     }
 };