Various build fixes for Windows:

* Fix processor #defines in stack trace generation code
* Fix return type of doEdgeSplitting. It doesn't actually return anything.
* Work around internal compiler error in the array construction in qquickworkerscript.cpp

Change-Id: I8fac4bc2e8ca7447f4eeff260d8502d70ff6faf6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/qml/v4/qv4engine.cpp b/src/qml/qml/v4/qv4engine.cpp
index 8a15010..608a94c 100644 (file)
--- a/src/qml/qml/v4/qv4engine.cpp
+++ b/src/qml/qml/v4/qv4engine.cpp
@@ -623,7 +623,7 @@ namespace {
             STACKFRAME64 sf64;
             memset(&sf64, 0, sizeof(sf64));
 
-#if defined(Q_PROCESSOR_X86)
+#if defined(Q_PROCESSOR_X86_32)
             machineType = IMAGE_FILE_MACHINE_I386;
 
             sf64.AddrFrame.Offset = winContext.Ebp;
@@ -633,7 +633,7 @@ namespace {
             sf64.AddrStack.Offset = winContext.Esp;
             sf64.AddrStack.Mode = AddrModeFlat;
 
-#elif defined(Q_PROCESSOR_X86_32)
+#elif defined(Q_PROCESSOR_X86_64)
             machineType = IMAGE_FILE_MACHINE_AMD64;
 
             sf64.AddrFrame.Offset = winContext.Rbp;

diff --git a/src/qml/qml/v4/qv4ssa.cpp b/src/qml/qml/v4/qv4ssa.cpp
index b86616c..937b183 100644 (file)
--- a/src/qml/qml/v4/qv4ssa.cpp
+++ b/src/qml/qml/v4/qv4ssa.cpp
@@ -1569,7 +1569,7 @@ void insertMove(Function *function, BasicBlock *basicBlock, Temp *target, Expr *
     basicBlock->statements.insert(basicBlock->statements.size() - 1, s);
 }
 
-bool doEdgeSplitting(Function *f)
+void doEdgeSplitting(Function *f)
 {
     const QVector<BasicBlock *> oldBBs = f->basicBlocks;
 

diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index e1ab6e6..1ec6a45 100644 (file)
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -231,10 +231,9 @@ void QQuickWorkerScriptEnginePrivate::WorkerEngine::init()
     QV4::Script createsendscript(m_v4Engine->rootContext, SEND_MESSAGE_CREATE_SCRIPT);
     QV4::FunctionObject *createsendconstructor = createsendscript.run().asFunctionObject();
 
-    QV4::Value args[] = {
-        QV4::Value::fromObject(m_v4Engine->newBuiltinFunction(m_v4Engine->rootContext, m_v4Engine->newString(QStringLiteral("sendMessage")),
-                                                              QQuickWorkerScriptEnginePrivate::sendMessage))
-    };
+    QV4::Value function = QV4::Value::fromObject(m_v4Engine->newBuiltinFunction(m_v4Engine->rootContext, m_v4Engine->newString(QStringLiteral("sendMessage")),
+                                                          QQuickWorkerScriptEnginePrivate::sendMessage));
+    QV4::Value args[] = { function };
     createsend = createsendconstructor->call(global(), args, 1);
 }