Temporarily disable libunwind exception throwing on Mac

The run-time appears to have a slightly different behaviour wrt exception
ownership. We don't strictly need this code path on Mac, so use regular C++
exceptions until I can figure out what happens there.

Change-Id: Idd540c8656d25ffdb4002843f398114881e33214
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index d5c29e8..14701fe 100644 (file)
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -110,7 +110,7 @@ linux*|mac {
     LIBS += -ldl
 }
 
-!win32:!ios {
+!win32:!ios:!mac {
     *g++*:equals(QT_ARCH, "arm") {
         static_libgcc = $$system($$QMAKE_CXX -print-file-name=libgcc.a)
         LIBS += $$static_libgcc

diff --git a/src/qml/jsruntime/qv4stacktrace.cpp b/src/qml/jsruntime/qv4stacktrace.cpp
index c715b62..7b7060d 100644 (file)
--- a/src/qml/jsruntime/qv4stacktrace.cpp
+++ b/src/qml/jsruntime/qv4stacktrace.cpp
@@ -49,7 +49,7 @@
 #include "qv4engine_p.h"
 #include "qv4unwindhelper_p.h"
 
-#ifdef V4_CXX_ABI_EXCEPTION
+#if defined(V4_CXX_ABI_EXCEPTION) || defined(Q_OS_DARWIN)
 #include <unwind.h>
 
 struct BacktraceHelper
@@ -95,7 +95,7 @@ NativeStackTrace::NativeStackTrace(ExecutionContext *context)
     engine = context->engine;
     currentNativeFrame = 0;
 
-#ifdef V4_CXX_ABI_EXCEPTION
+#if defined(V4_CXX_ABI_EXCEPTION) || defined(Q_OS_DARWIN)
     UnwindHelper::prepareForUnwind(context);
 
     nativeFrameCount = get_backtrace_from_libunwind(&trace[0], sizeof(trace) / sizeof(trace[0]));