Merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_cherrypickpatches into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Timo Jyrinki]

* debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch
  - Backport from upstream code submittal (LP: #1294181)
* debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch
  - Backport a fix from upstream (LP: #1294019)
* debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch
  debian/patches/V4-fix-range-sorting.patch
  debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch
  - Replace Don-t-use-ebx-in-the-x86-register-allocator.patch with a newer
    set of fixes from upstream (LP: #1271033)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/11/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Once again tests succeeded in the landing PPA:
https://launchpad.net/~ci-train-ppa-service/+archive/landing-006/+sourcepub/4040443/+listing-archive-extra

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-autolanding/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-autolanding/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-autolanding/9

review: Needs Fixing (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-14 09:39:06 +0000
+++ debian/changelog	2014-03-24 06:36:21 +0000
@@ -1,3 +1,17 @@
+qtdeclarative-opensource-src (5.2.1-3ubuntu11) trusty; urgency=medium
+
+  * debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch
+    - Backport from upstream code submittal (LP: #1294181)
+  * debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch
+    - Backport a fix from upstream (LP: #1294019)
+  * debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch
+    debian/patches/V4-fix-range-sorting.patch
+    debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch
+    - Replace Don-t-use-ebx-in-the-x86-register-allocator.patch with a newer 
+      set of fixes from upstream (LP: #1271033)
+
+ -- Timo Jyrinki <[e-mail]>  Mon, 24 Mar 2014 06:27:18 +0000
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu10) trusty; urgency=medium
 
   * debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch

=== added file 'debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch'
--- debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Don-t-crash-on-Runtime-getQmlImportedScripts.patch	2014-03-24 06:36:21 +0000
@@ -0,0 +1,42 @@
+From b4f14b1942698dea537bb08222907db56575a906 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <[e-mail]>
+Date: Thu, 20 Mar 2014 16:28:15 +0100
+Subject: [PATCH] Don't crash on Runtime::getQmlImportedScripts
+
+Task-number: QTBUG-37303
+
+Change-Id: I083ca0cc3223fe0dbf1c768ad43a0d4927579867
+---
+ src/qml/jsruntime/qv4runtime.cpp                   |  4 +++
+ tests/auto/qml/qqmlecmascript/data/Types.js        |  3 ++
+ ...rtedScriptsAccessOnObjectWithInvalidContext.qml | 42 ++++++++++++++++++++++
+ .../auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 11 ++++++
+ 4 files changed, 60 insertions(+)
+ create mode 100644 tests/auto/qml/qqmlecmascript/data/Types.js
+ create mode 100644 tests/auto/qml/qqmlecmascript/data/importedScriptsAccessOnObjectWithInvalidContext.qml
+
+diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
+index 2b63632..99b7d98 100644
+--- a/src/qml/jsruntime/qv4runtime.cpp
++++ b/src/qml/jsruntime/qv4runtime.cpp
+@@ -1245,6 +1245,8 @@ ReturnedValue __qmljs_get_id_array(NoThrowContext *ctx)
+ ReturnedValue __qmljs_get_context_object(NoThrowContext *ctx)
+ {
+     QQmlContextData *context = QmlContextWrapper::callingContext(ctx->engine);
++    if (!context)
++        return Encode::undefined();
+     return QObjectWrapper::wrap(ctx->engine, context->contextObject);
+ }
+ 
+@@ -1292,6 +1294,8 @@ void __qmljs_set_qobject_property(ExecutionContext *ctx, const ValueRef object,
+ ReturnedValue __qmljs_get_imported_scripts(NoThrowContext *ctx)
+ {
+     QQmlContextData *context = QmlContextWrapper::callingContext(ctx->engine);
++    if (!context)
++        return Encode::undefined();
+     return context->importedScripts.value();
+ }
+ 
+-- 
+1.9.0
+

=== removed file 'debian/patches/Don-t-use-ebx-in-the-x86-register-allocator.patch'
--- debian/patches/Don-t-use-ebx-in-the-x86-register-allocator.patch	2014-01-24 09:11:04 +0000
+++ debian/patches/Don-t-use-ebx-in-the-x86-register-allocator.patch	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-From 81478579982bc33c785866998f88c3aa0d362c03 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <[e-mail]>
-Date: Thu, 23 Jan 2014 13:15:08 +0100
-Subject: [PATCH] Don't use ebx in the x86 register allocator
-
-ebx is mentioned as one of the registers you can't freely use
-in the various assembly literature, so if we do we may end up upsetting
-the compiler
-
-Task-number: QTBUG-36289
-
-Change-Id: I09000a02286dbc62fc3b7905c770b1cfa6de76a1
----
- src/qml/compiler/qv4isel_masm.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
-index 35097ba..5750e05 100644
---- a/src/qml/compiler/qv4isel_masm.cpp
-+++ b/src/qml/compiler/qv4isel_masm.cpp
-@@ -569,8 +569,7 @@ void InstructionSelection::run(int functionIndex)
-     if (opt.isInSSA() && withRegisterAllocator) {
- #if CPU(X86) && OS(LINUX) // x86 with linux
-         static const QVector<int> intRegisters = QVector<int>()
--                << JSC::X86Registers::edx
--                << JSC::X86Registers::ebx;
-+                << JSC::X86Registers::edx;
- #else // x86_64 with linux or with macos
-         static const QVector<int> intRegisters = QVector<int>()
-                 << JSC::X86Registers::edi
--- 
-1.8.5.3
-

=== added file 'debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch'
--- debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Fix-global-object-handling-in-worker-script-JS-files.patch	2014-03-24 06:36:21 +0000
@@ -0,0 +1,265 @@
+From 9999479b269f685373ceb20d42ff7e5955ba9f63 Mon Sep 17 00:00:00 2001
+From: Michael Brasser <[e-mail]>
+Date: Mon, 17 Feb 2014 09:35:20 -0600
+Subject: [PATCH] Fix global object handling in worker script JS files.
+
+Task-number: QTBUG-36874
+Task-number: QTBUG-36881
+Change-Id: Iacf4807dd37862e792ad1ba4ce540a6d48f1e495
+---
+ src/qml/qml/qqmlcontextwrapper.cpp                 | 14 ++--
+ .../qml/qquickworkerscript/data/script_function.js |  8 +++
+ .../qml/qquickworkerscript/data/script_global.js   |  5 ++
+ .../qml/qquickworkerscript/data/script_global2.js  |  6 ++
+ .../auto/qml/qquickworkerscript/data/script_var.js |  6 ++
+ .../qquickworkerscript/data/worker_function.qml    |  5 ++
+ .../qml/qquickworkerscript/data/worker_global.qml  |  5 ++
+ .../qml/qquickworkerscript/data/worker_global2.qml |  5 ++
+ .../qml/qquickworkerscript/data/worker_var.qml     |  5 ++
+ .../qquickworkerscript/tst_qquickworkerscript.cpp  | 83 +++++++++++++++++++++-
+ 10 files changed, 134 insertions(+), 8 deletions(-)
+ create mode 100644 tests/auto/qml/qquickworkerscript/data/script_function.js
+ create mode 100644 tests/auto/qml/qquickworkerscript/data/script_global.js
+ create mode 100644 tests/auto/qml/qquickworkerscript/data/script_global2.js
+ create mode 100644 tests/auto/qml/qquickworkerscript/data/script_var.js
+ create mode 100644 tests/auto/qml/qquickworkerscript/data/worker_function.qml
+ create mode 100644 tests/auto/qml/qquickworkerscript/data/worker_global.qml
+ create mode 100644 tests/auto/qml/qquickworkerscript/data/worker_global2.qml
+ create mode 100644 tests/auto/qml/qquickworkerscript/data/worker_var.qml
+
+diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
+index 1ca9c6a..d221e07 100644
+--- a/src/qml/qml/qqmlcontextwrapper.cpp
++++ b/src/qml/qml/qqmlcontextwrapper.cpp
+@@ -288,6 +288,13 @@ void QmlContextWrapper::put(Managed *m, const StringRef name, const ValueRef val
+         return;
+     }
+ 
++    PropertyAttributes attrs;
++    Property *pd  = wrapper->__getOwnProperty__(name, &attrs);
++    if (pd) {
++        wrapper->putValue(pd, attrs, value);
++        return;
++    }
++
+     if (wrapper->isNullWrapper) {
+         if (wrapper && wrapper->readOnly) {
+             QString error = QLatin1String("Invalid write to global property \"") + name->toQString() +
+@@ -301,13 +308,6 @@ void QmlContextWrapper::put(Managed *m, const StringRef name, const ValueRef val
+         return;
+     }
+ 
+-    PropertyAttributes attrs;
+-    Property *pd  = wrapper->__getOwnProperty__(name, &attrs);
+-    if (pd) {
+-        wrapper->putValue(pd, attrs, value);
+-        return;
+-    }
+-
+     // Its possible we could delay the calculation of the "actual" context (in the case
+     // of sub contexts) until it is definately needed.
+     QQmlContextData *context = wrapper->getContext();
+diff --git a/tests/auto/qml/qquickworkerscript/data/script_function.js b/tests/auto/qml/qquickworkerscript/data/script_function.js
+new file mode 100644
+index 0000000..c0391dd
+--- /dev/null
++++ b/tests/auto/qml/qquickworkerscript/data/script_function.js
+@@ -0,0 +1,8 @@
++function func() {
++    return "World"
++}
++
++WorkerScript.onMessage = function(msg) {
++    WorkerScript.sendMessage(msg + " " + func())
++}
++
+diff --git a/tests/auto/qml/qquickworkerscript/data/script_global.js b/tests/auto/qml/qquickworkerscript/data/script_global.js
+new file mode 100644
+index 0000000..cce4f2c
+--- /dev/null
++++ b/tests/auto/qml/qquickworkerscript/data/script_global.js
+@@ -0,0 +1,5 @@
++WorkerScript.onMessage = function(msg) {
++    world = "World"
++    WorkerScript.sendMessage(msg + " " + world)
++}
++
+diff --git a/tests/auto/qml/qquickworkerscript/data/script_global2.js b/tests/auto/qml/qquickworkerscript/data/script_global2.js
+new file mode 100644
+index 0000000..0867f7e
+--- /dev/null
++++ b/tests/auto/qml/qquickworkerscript/data/script_global2.js
+@@ -0,0 +1,6 @@
++world = "World"
++
++WorkerScript.onMessage = function(msg) {
++    WorkerScript.sendMessage(msg + " " + world)
++}
++
+diff --git a/tests/auto/qml/qquickworkerscript/data/script_var.js b/tests/auto/qml/qquickworkerscript/data/script_var.js
+new file mode 100644
+index 0000000..77107e8
+--- /dev/null
++++ b/tests/auto/qml/qquickworkerscript/data/script_var.js
+@@ -0,0 +1,6 @@
++var world = "World"
++
++WorkerScript.onMessage = function(msg) {
++    WorkerScript.sendMessage(msg + " " + world)
++}
++
+diff --git a/tests/auto/qml/qquickworkerscript/data/worker_function.qml b/tests/auto/qml/qquickworkerscript/data/worker_function.qml
+new file mode 100644
+index 0000000..f8d01dc
+--- /dev/null
++++ b/tests/auto/qml/qquickworkerscript/data/worker_function.qml
+@@ -0,0 +1,5 @@
++import QtQuick 2.0
++
++BaseWorker {
++    source: "script_function.js"
++}
+diff --git a/tests/auto/qml/qquickworkerscript/data/worker_global.qml b/tests/auto/qml/qquickworkerscript/data/worker_global.qml
+new file mode 100644
+index 0000000..546afd2
+--- /dev/null
++++ b/tests/auto/qml/qquickworkerscript/data/worker_global.qml
+@@ -0,0 +1,5 @@
++import QtQuick 2.0
++
++BaseWorker {
++    source: "script_global.js"
++}
+diff --git a/tests/auto/qml/qquickworkerscript/data/worker_global2.qml b/tests/auto/qml/qquickworkerscript/data/worker_global2.qml
+new file mode 100644
+index 0000000..42cad38
+--- /dev/null
++++ b/tests/auto/qml/qquickworkerscript/data/worker_global2.qml
+@@ -0,0 +1,5 @@
++import QtQuick 2.0
++
++BaseWorker {
++    source: "script_global2.js"
++}
+diff --git a/tests/auto/qml/qquickworkerscript/data/worker_var.qml b/tests/auto/qml/qquickworkerscript/data/worker_var.qml
+new file mode 100644
+index 0000000..ea6a23c
+--- /dev/null
++++ b/tests/auto/qml/qquickworkerscript/data/worker_var.qml
+@@ -0,0 +1,5 @@
++import QtQuick 2.0
++
++BaseWorker {
++    source: "script_var.js"
++}
+diff --git a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
+index a799fc4..57dc988 100644
+--- a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
++++ b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
+@@ -68,6 +68,9 @@ private slots:
+     void script_included();
+     void scriptError_onLoad();
+     void scriptError_onCall();
++    void script_function();
++    void script_var();
++    void script_global();
+     void stressDispose();
+ 
+ private:
+@@ -235,7 +238,6 @@ void tst_QQuickWorkerScript::script_included()
+     waitForEchoMessage(worker);
+ 
+     const QMetaObject *mo = worker->metaObject();
+-    QEXPECT_FAIL("", "It is not possible to write to the global object right now", Continue);
+     QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).toString(), value + " World");
+ 
+     qApp->processEvents();
+@@ -283,6 +285,85 @@ void tst_QQuickWorkerScript::scriptError_onCall()
+     delete worker;
+ }
+ 
++void tst_QQuickWorkerScript::script_function()
++{
++    QQmlComponent component(&m_engine, testFileUrl("worker_function.qml"));
++    QQuickWorkerScript *worker = qobject_cast<QQuickWorkerScript*>(component.create());
++    QVERIFY(worker != 0);
++
++    QString value("Hello");
++
++    QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
++    waitForEchoMessage(worker);
++
++    const QMetaObject *mo = worker->metaObject();
++    QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).toString(), value + " World");
++
++    qApp->processEvents();
++    delete worker;
++}
++
++void tst_QQuickWorkerScript::script_var()
++{
++    QQmlComponent component(&m_engine, testFileUrl("worker_var.qml"));
++    QQuickWorkerScript *worker = qobject_cast<QQuickWorkerScript*>(component.create());
++    QVERIFY(worker != 0);
++
++    QString value("Hello");
++
++    QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
++    waitForEchoMessage(worker);
++
++    const QMetaObject *mo = worker->metaObject();
++    QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).toString(), value + " World");
++
++    qApp->processEvents();
++    delete worker;
++}
++
++void tst_QQuickWorkerScript::script_global()
++{
++    {
++        QQmlComponent component(&m_engine, testFileUrl("worker_global.qml"));
++        QQuickWorkerScript *worker = qobject_cast<QQuickWorkerScript*>(component.create());
++        QVERIFY(worker != 0);
++
++        QString value("Hello");
++
++        QtMessageHandler previousMsgHandler = qInstallMessageHandler(qquickworkerscript_warningsHandler);
++
++        QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
++
++        QTRY_COMPARE(qquickworkerscript_lastWarning,
++                testFileUrl("script_global.js").toString() + QLatin1String(":2: Invalid write to global property \"world\""));
++
++        qInstallMessageHandler(previousMsgHandler);
++
++        qApp->processEvents();
++        delete worker;
++    }
++
++    {
++        QQmlComponent component(&m_engine, testFileUrl("worker_global2.qml"));
++        QQuickWorkerScript *worker = qobject_cast<QQuickWorkerScript*>(component.create());
++        QVERIFY(worker != 0);
++
++        QString value("Hello");
++
++        QtMessageHandler previousMsgHandler = qInstallMessageHandler(qquickworkerscript_warningsHandler);
++
++        QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
++
++        QTRY_COMPARE(qquickworkerscript_lastWarning,
++                testFileUrl("script_global.js").toString() + QLatin1String(":2: Invalid write to global property \"world\""));
++
++        qInstallMessageHandler(previousMsgHandler);
++
++        qApp->processEvents();
++        delete worker;
++    }
++}
++
+ // Rapidly create and destroy worker scripts to test resources are being disposed
+ // in the correct isolate
+ void tst_QQuickWorkerScript::stressDispose()
+-- 
+1.9.0
+

=== added file 'debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch'
--- debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch	2014-03-24 06:36:21 +0000
@@ -0,0 +1,47 @@
+From e42e6a8d432270a5393f7451f63074af0811dddf Mon Sep 17 00:00:00 2001
+From: Erik Verbruggen <[e-mail]>
+Date: Mon, 27 Jan 2014 13:00:20 +0100
+Subject: [PATCH] V4 JIT: save/restore ebx (GOT ptr) on linux/x86.
+
+On linux/x86, ebx is used to store the global offset table. When using
+this register for temporary values, we have to save it at the entry of
+a generated function, and restore it before doing calls and at the end.
+
+Task-number: QTBUG-36289
+Change-Id: I30194be3ce44f58b793ee52f6201906bcb68d46a
+---
+ src/qml/compiler/qv4isel_masm.cpp | 2 +-
+ src/qml/compiler/qv4isel_masm_p.h | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
+index 0cfb684..0fcd770 100644
+--- a/src/qml/compiler/qv4isel_masm.cpp
++++ b/src/qml/compiler/qv4isel_masm.cpp
+@@ -122,7 +122,7 @@ static const Assembler::RegisterID calleeSavedRegisters[] = {
+ 
+ #if CPU(X86)
+ static const Assembler::RegisterID calleeSavedRegisters[] = {
+-    // Not used: JSC::X86Registers::ebx,
++    JSC::X86Registers::ebx, // temporary register
+     JSC::X86Registers::esi, // ContextRegister
+     JSC::X86Registers::edi  // LocalsRegister
+ };
+diff --git a/src/qml/compiler/qv4isel_masm_p.h b/src/qml/compiler/qv4isel_masm_p.h
+index a146220..7dfe6a8 100644
+--- a/src/qml/compiler/qv4isel_masm_p.h
++++ b/src/qml/compiler/qv4isel_masm_p.h
+@@ -981,6 +981,10 @@ public:
+         prepareRelativeCall(function, this);
+         loadArgumentOnStackOrRegister<0>(arg1);
+ 
++#if OS(LINUX) && CPU(X86) && (defined(__PIC__) || defined(__PIE__))
++        load32(Address(StackFrameRegister, -sizeof(void*)), JSC::X86Registers::ebx); // restore the GOT ptr
++#endif
++
+         callAbsolute(functionName, function);
+ 
+         if (stackSpaceNeeded)
+-- 
+1.9.0
+

=== added file 'debian/patches/V4-fix-range-sorting.patch'
--- debian/patches/V4-fix-range-sorting.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/V4-fix-range-sorting.patch	2014-03-24 06:36:21 +0000
@@ -0,0 +1,46 @@
+From 719f7741ec344392a36280707916e4f98e906b9c Mon Sep 17 00:00:00 2001
+From: Erik Verbruggen <[e-mail]>
+Date: Thu, 30 Jan 2014 13:15:52 +0100
+Subject: [PATCH] V4: fix range sorting
+
+When a life-time interval is split from another interval, it has to come
+before an interval that starts at the same position but is not split.
+
+This also means that a means that the all ranges in a split interval
+are uses, which is important for allocation: all incoming parameters for
+an operation need to be allocated before allocating a register for the
+result as the result will only start its life "at the end" of the
+operation.
+
+This patch fixes a problem register allocation is done in a function
+where register pressure is high (e.g. on platforms that have few
+registers to start with). Specifically, crypto.js on x86 triggered it.
+
+Change-Id: Iee3e5d82a887b8de573dfc23513844143d0c8073
+---
+ src/qml/compiler/qv4ssa.cpp | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
+index 44c93df..594c38d 100644
+--- a/src/qml/compiler/qv4ssa.cpp
++++ b/src/qml/compiler/qv4ssa.cpp
+@@ -3705,9 +3705,12 @@ void LifeTimeInterval::dump(QTextStream &out) const {
+ }
+ 
+ bool LifeTimeInterval::lessThan(const LifeTimeInterval &r1, const LifeTimeInterval &r2) {
+-    if (r1._ranges.first().start == r2._ranges.first().start)
+-        return r1._ranges.last().end < r2._ranges.last().end;
+-    else
++    if (r1._ranges.first().start == r2._ranges.first().start) {
++        if (r1.isSplitFromInterval() == r2.isSplitFromInterval())
++            return r1._ranges.last().end < r2._ranges.last().end;
++        else
++            return r1.isSplitFromInterval();
++    } else
+         return r1._ranges.first().start < r2._ranges.first().start;
+ }
+ 
+-- 
+1.9.0
+

=== added file 'debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch'
--- debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/V4-regalloc-fix-interval-splitting-when-register-pre.patch	2014-03-24 06:36:21 +0000
@@ -0,0 +1,103 @@
+From add00b97c52981cf157b283d2a56417e8b1bd899 Mon Sep 17 00:00:00 2001
+From: Erik Verbruggen <[e-mail]>
+Date: Thu, 30 Jan 2014 13:48:31 +0100
+Subject: [PATCH] V4 regalloc: fix interval splitting when register pressure is
+ high.
+
+When a register is needed for an interval, but none is available, one
+of the used registers will be chosen and spilled to the stack (meaning
+it will be split) before the current position. However, if a register
+is used at the current position for an incoming parameter, its interval
+has to be split after the current position. This patch adds/fixes the
+latter case.
+
+This fixes crypto.js on x86. The specific problem there was that the
+result of an operation needed a register, and chose the one from one
+of the incoming parameters (which then should get spilled/split).
+However, this interval was already split, and started exactly at that
+the current position. So splitting before the current position did
+nothing, resulting in it staying alive and using the same register as
+the result. So any subsequent use of would have the invalid value.
+
+Task-number: QTBUG-36430
+Change-Id: I228fc210b009aa0b16b08a374fc955fabfbb6d12
+---
+ src/qml/compiler/qv4regalloc.cpp | 34 +++++++++++++++++++++++++++-------
+ 1 file changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/src/qml/compiler/qv4regalloc.cpp b/src/qml/compiler/qv4regalloc.cpp
+index a3255f2..ea2338a 100644
+--- a/src/qml/compiler/qv4regalloc.cpp
++++ b/src/qml/compiler/qv4regalloc.cpp
+@@ -111,6 +111,13 @@ public:
+         return false;
+     }
+ 
++    bool isUsedAt(const Temp &t, int position) {
++        foreach (const Use &use, uses(t))
++            if (use.pos == position)
++                return true;
++        return false;
++    }
++
+     int def(const Temp &t) const {
+         Q_ASSERT(_defs[t].isValid());
+         return _defs[t].defStmt;
+@@ -743,17 +750,17 @@ private:
+             os << "Intervals live at the start of L" << bb->index << ":" << endl;
+             if (_liveAtStart[bb].isEmpty())
+                 os << "\t(none)" << endl;
+-            foreach (const LifeTimeInterval &i, _liveAtStart[bb]) {
++            foreach (const LifeTimeInterval *i, _liveAtStart[bb]) {
+                 os << "\t";
+-                i.dump(os);
++                i->dump(os);
+                 os << endl;
+             }
+             os << "Intervals live at the end of L" << bb->index << ":" << endl;
+             if (_liveAtEnd[bb].isEmpty())
+                 os << "\t(none)" << endl;
+-            foreach (const LifeTimeInterval &i, _liveAtEnd[bb]) {
++            foreach (const LifeTimeInterval *i, _liveAtEnd[bb]) {
+                 os << "\t";
+-                i.dump(os);
++                i->dump(os);
+                 os << endl;
+             }
+ #endif
+@@ -1066,6 +1073,8 @@ RegisterAllocator::RegisterAllocator(const QVector<int> &normalRegisters, const
+     : _normalRegisters(normalRegisters)
+     , _fpRegisters(fpRegisters)
+ {
++    Q_ASSERT(normalRegisters.size() >= 2);
++    Q_ASSERT(fpRegisters.size() >= 2);
+ }
+ 
+ RegisterAllocator::~RegisterAllocator()
+@@ -1413,9 +1422,20 @@ void RegisterAllocator::allocateBlockedReg(LifeTimeInterval &current, const int
+ #endif // DEBUG_REGALLOC
+         current.setReg(reg);
+         _lastAssignedRegister.insert(current.temp(), reg);
+-        Q_ASSERT(nextUseRangeForReg[reg]);
+-        Q_ASSERT(!nextUseRangeForReg[reg]->isFixedInterval());
+-        split(*nextUseRangeForReg[reg], position);
++        LifeTimeInterval *nextUse = nextUseRangeForReg[reg];
++        Q_ASSERT(nextUse);
++        Q_ASSERT(!nextUse->isFixedInterval());
++
++        if (_info->isUsedAt(nextUse->temp(), position)) {
++            Q_ASSERT(!_info->isUsedAt(current.temp(), position));
++            // the register is used (as an incoming parameter) at the current position, so split
++            // the interval immediately after the (use at the) current position
++            split(*nextUse, position + 1);
++        } else {
++            // the register was used before the current position
++            split(*nextUse, position);
++        }
++
+         splitInactiveAtEndOfLifetimeHole(reg, needsFPReg, position);
+ 
+         // make sure that current does not intersect with the fixed interval for reg
+-- 
+1.9.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-14 09:37:59 +0000
+++ debian/patches/series	2014-03-24 06:36:21 +0000
@@ -5,7 +5,6 @@
 fix_binary_location_for_tests.patch
 disable_failing_tests.patch
 Make-sure-the-test-window-has-focus.patch
-Don-t-use-ebx-in-the-x86-register-allocator.patch
 V4-Array.push-on-QStringList-should-invoke-putIndexe.patch
 Guarantee-event-s-default-state-as-not-accepted.patch
 Fix-crash-when-accessing-var-properties-in-objects-w.patch
@@ -13,3 +12,8 @@
 ppc64el.patch
 clean_chain_of_incubated_objects.patch
 Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch
+Don-t-crash-on-Runtime-getQmlImportedScripts.patch
+Fix-global-object-handling-in-worker-script-JS-files.patch
+V4-JIT-save-restore-ebx-GOT-ptr-on-linux-x86.patch
+V4-fix-range-sorting.patch
+V4-regalloc-fix-interval-splitting-when-register-pre.patch