3 files changed, 112 insertions, 1 deletions
diff --git a/tests/auto/qml/qv4assembler/data/crash.qml b/tests/auto/qml/qv4assembler/data/crash.qml
new file mode 100644
index 0000000000..dfdb9ceba5
--- /dev/null
+++ b/tests/auto/qml/qv4assembler/data/crash.qml
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQml 2.2
+import Crash 1.0
+
+QtObject {
+    property Crash crash: Crash {
+        id: crash
+    }
+
+    // Recursion makes the crash more reliable
+    // With a single frame the unwinder might guess
+    // the next frame by chance.
+    function recurse(x) {
+        if (x > 32)
+            crash.crash();
+        else
+            recurse(x + 1);
+    }
+
+    property Timer timer: Timer {
+        interval: 10
+        running: true
+        onTriggered: recurse(0)
+    }
+}
+
diff --git a/tests/auto/qml/qv4assembler/qv4assembler.pro b/tests/auto/qml/qv4assembler/qv4assembler.pro
index afd7586ac7..895e241cc9 100644
--- a/tests/auto/qml/qv4assembler/qv4assembler.pro
+++ b/tests/auto/qml/qv4assembler/qv4assembler.pro
@@ -1,7 +1,12 @@
 CONFIG += testcase
 TARGET = tst_qv4assembler
+
+include (../../shared/util.pri)
+
 macos:CONFIG -= app_bundle
 
+TESTDATA = data/*
+
 SOURCES += tst_qv4assembler.cpp
 
 QT += qml-private testlib
diff --git a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
index afc00ec72c..fd50ff5020 100644
--- a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
+++ b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
@@ -26,20 +26,37 @@
 **
 ****************************************************************************/
 
+#include <util.h>
+
 #include <QtTest/QtTest>
 #include <QtCore/qprocess.h>
 #include <QtCore/qtemporaryfile.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlapplicationengine.h>
+
 #include <private/qv4global_p.h>
 
-class tst_QV4Assembler : public QObject
+#ifdef Q_OS_WIN
+#include <windows.h>
+#endif
+
+class tst_QV4Assembler : public QQmlDataTest
 {
     Q_OBJECT
 
 private slots:
+    void initTestCase() override;
     void perfMapFile();
+    void functionTable();
     void jitEnabled();
 };
 
+void tst_QV4Assembler::initTestCase()
+{
+    qputenv("QV4_JIT_CALL_THRESHOLD", "0");
+    QQmlDataTest::initTestCase();
+}
+
 void tst_QV4Assembler::perfMapFile()
 {
 #if !defined(Q_OS_LINUX)
@@ -87,6 +104,42 @@ void tst_QV4Assembler::perfMapFile()
 #endif
 }
 
+#ifdef Q_OS_WIN
+class Crash : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Crash(QObject *parent = nullptr) : QObject(parent) { }
+    Q_INVOKABLE static void crash();
+};
+
+static bool crashHandlerHit = false;
+
+static LONG WINAPI crashHandler(EXCEPTION_POINTERS*)
+{
+    crashHandlerHit = true;
+    return EXCEPTION_CONTINUE_EXECUTION;
+}
+
+void Crash::crash()
+{
+    SetUnhandledExceptionFilter(crashHandler);
+    RaiseException(EXCEPTION_ACCESS_VIOLATION, 0, 0, nullptr);
+}
+#endif
+
+void tst_QV4Assembler::functionTable()
+{
+#ifndef Q_OS_WIN
+    QSKIP("Function tables only exist on windows.");
+#else
+    QQmlApplicationEngine engine;
+    qmlRegisterType<Crash>("Crash", 1, 0, "Crash");
+    engine.load(testFileUrl("crash.qml"));
+    QTRY_VERIFY(crashHandlerHit);
+#endif
+}
+
 #ifdef V4_ENABLE_JIT
 #define JIT_ENABLED 1
 #else