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

[Timo Jyrinki]

* debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch:
  - [regression] Re-enable the opt-in QML cache patch (LP: #1418060)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-opensource-src_reenable_qmlcache]

182. By Timo Jyrinki on 2015-02-25

Add headers to the QML cache patch.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-opensource-src_reenable_qmlcache]

183. By Timo Jyrinki on 2015-02-26

* Update symbols from build logs.
* Don't run unit tests on 32-bit powerpc, those fail more often
  than not. Other archs not affected.

Also, small tweaks to the QML cache patch.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

(CI is still broken, but all testing has now succeeded)

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-16 12:07:42 +0000
+++ debian/changelog	2015-02-26 09:47:31 +0000
@@ -1,3 +1,13 @@
+qtdeclarative-opensource-src (5.4.0-4ubuntu2) vivid; urgency=medium
+
+  * debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch:
+    - [regression] Re-enable the opt-in QML cache patch (LP: #1418060)
+  * Update symbols from build logs.
+  * Don't run unit tests on 32-bit powerpc, those fail more often 
+    than not. Other archs not affected.
+
+ -- Timo Jyrinki <[e-mail]>  Tue, 24 Feb 2015 14:01:39 +0000
+
 qtdeclarative-opensource-src (5.4.0-4ubuntu1) vivid; urgency=medium
 
   * New upstream release.
 
=== modified file 'debian/libqt5qml5.symbols'
--- debian/libqt5qml5.symbols	2015-02-10 15:24:07 +0000
+++ debian/libqt5qml5.symbols	2015-02-26 09:47:31 +0000
@@ -1573,6 +1573,7 @@
  _ZN3QV422PersistentValuePrivateD0Ev@Base 5.2.0~beta1
  _ZN3QV422PersistentValuePrivateD1Ev@Base 5.2.0~beta1
  _ZN3QV422PersistentValuePrivateD2Ev@Base 5.2.0~beta1
+ _ZN3QV424EvalInstructionSelection6runAllEb@Base 5.4.0 1
  _ZN3QV424EvalInstructionSelection7compileEb@Base 5.3.0 1
  _ZN3QV424EvalInstructionSelectionC1EPNS_19ExecutableAllocatorEPNS_2IR6ModuleEPNS_8Compiler15JSUnitGeneratorE@Base 5.3.0 1
  _ZN3QV424EvalInstructionSelectionC2EPNS_19ExecutableAllocatorEPNS_2IR6ModuleEPNS_8Compiler15JSUnitGeneratorE@Base 5.3.0 1
@@ -1642,6 +1643,7 @@
  (arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection22callBuiltinDeleteValueEPNS_2IR4ExprE@Base 5.4.0
  (arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection22callBuiltinTypeofValueEPNS_2IR4ExprES4_@Base 5.4.0
  (arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection22loadQmlImportedScriptsEPNS_2IR4ExprE@Base 5.4.0
+ (arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection22mutableCompilationUnitEv@Base 5.4.0
  (arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection23callBuiltinDeleteMemberEPNS_2IR4ExprERK7QStringS4_@Base 5.4.0
  (arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection23callBuiltinTypeofMemberEPNS_2IR4ExprERK7QStringS4_@Base 5.4.0
  (arch=!arm64 !powerpc !ppc64el)_ZN3QV43JIT20InstructionSelection23visitCJumpNullUndefinedENS_2IR4TypeEPNS2_5BinopEPNS2_10BasicBlockES7_@Base 5.3.0
@@ -1711,6 +1713,7 @@
  _ZN3QV44Moth20InstructionSelection22callBuiltinDeleteValueEPNS_2IR4ExprE@Base 5.4.0
  _ZN3QV44Moth20InstructionSelection22callBuiltinTypeofValueEPNS_2IR4ExprES4_@Base 5.4.0
  _ZN3QV44Moth20InstructionSelection22loadQmlImportedScriptsEPNS_2IR4ExprE@Base 5.4.0
+ _ZN3QV44Moth20InstructionSelection22mutableCompilationUnitEv@Base 5.4.0
  _ZN3QV44Moth20InstructionSelection23callBuiltinDeleteMemberEPNS_2IR4ExprERK7QStringS4_@Base 5.4.0
  _ZN3QV44Moth20InstructionSelection23callBuiltinTypeofMemberEPNS_2IR4ExprERK7QStringS4_@Base 5.4.0
  _ZN3QV44Moth20InstructionSelection24callBuiltinPushWithScopeEPNS_2IR4ExprE@Base 5.4.0
@@ -3358,7 +3361,7 @@
  (optional=templinst|arch=amd64 ppc64el)_ZNSt6vectorIbSaIbEE6resizeEmb@Base 5.4.0
  (optional=templinst|subst)_ZNSt6vectorIbSaIbEEC1E{size_t}RKbRKS0_@Base 5.4.0
  (optional=templinst|subst)_ZNSt6vectorIbSaIbEEC2E{size_t}RKbRKS0_@Base 5.4.0
- (optional=templinst|arch=armhf)_ZNSt6vectorIcSaIcEE17_M_default_appendEj@Base 5.4.0
+ (optional=templinst|arch=amd64 armhf i386|subst)_ZNSt6vectorIcSaIcEE17_M_default_appendE{size_t}@Base 5.4.0
  (optional=templinst|arch=amd64 i386)_ZNSt6vectorIcSaIcEE9push_backERKc@Base 5.4.0
  (optional=templinst)_ZNSt6vectorIiSaIiEE12emplace_backIIiEEEvDpOT_@Base 5.4.0
  (optional=templinst)_ZNSt6vectorIiSaIiEE12emplace_backIJiEEEvDpOT_@Base 5.4.0
@@ -4017,9 +4020,11 @@
  (c++)"non-virtual thunk to QQmlTimer::componentComplete()@Base" 5.0.2
  (c++)"non-virtual thunk to QQmlTimer::~QQmlTimer()@Base" 5.0.2
  (c++|arch=!arm64 !powerpc !ppc64el)"non-virtual thunk to QV4::JIT::InstructionSelection::backendCompileStep()@Base" 5.3.0
+ (c++|arch=amd64 armhf i386)"non-virtual thunk to QV4::JIT::InstructionSelection::mutableCompilationUnit()@Base" 5.4.0
  (c++|arch=!arm64 !powerpc !ppc64el)"non-virtual thunk to QV4::JIT::InstructionSelection::run(int)@Base" 5.3.0
  (c++|arch=!arm64 !powerpc !ppc64el)"non-virtual thunk to QV4::JIT::InstructionSelection::~InstructionSelection()@Base" 5.3.0
  (c++)"non-virtual thunk to QV4::Moth::InstructionSelection::backendCompileStep()@Base" 5.3.0
+ (c++)"non-virtual thunk to QV4::Moth::InstructionSelection::mutableCompilationUnit()@Base" 5.4.0
  (c++)"non-virtual thunk to QV4::Moth::InstructionSelection::run(int)@Base" 5.3.0
  (c++)"non-virtual thunk to QV4::Moth::InstructionSelection::~InstructionSelection()@Base" 5.3.0
  qt_v4StackTrace@Base 5.3.0
 
=== modified file 'debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch'
--- debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch	2015-02-10 12:14:13 +0000
+++ debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch	2015-02-26 09:47:31 +0000
@@ -1,7 +1,19 @@
-Index: qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/ARMv7Assembler.h
+Description: Add optional JIT unit cache
+ This patch adds a JIT unit cache to QML that speeds up application launches 
+ after the first launch has been done. It is activated only when environment 
+ variable QV4_ENABLE_JIT_CACHE is set.
+ . 
+ It has not yet been sent upstream for discussion, but that's being planned.
+Author: Ricardo Mendoza <[e-mail]>
+Origin: Canonical
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1418060
+Forwarded: No
+Last-Update: 2015-02-25
+
+Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/ARMv7Assembler.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/3rdparty/masm/assembler/ARMv7Assembler.h
-+++ qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/ARMv7Assembler.h
+--- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/ARMv7Assembler.h
++++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/ARMv7Assembler.h
 @@ -445,6 +445,12 @@ public:
          ConditionInvalid
      } Condition;
@@ -23,10 +35,10 @@
  
          unsigned debugOffset() { return m_buffer.debugOffset(); }
  
-Index: qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
+Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
-+++ qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
+--- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
++++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
 @@ -486,6 +486,11 @@ public:
              return Call(jump.m_label, Linkable);
          }
@@ -52,10 +64,10 @@
  protected:
      AbstractMacroAssembler()
          : m_randomSource(cryptographicallyRandomNumber())
-Index: qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/AssemblerBuffer.h
+Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AssemblerBuffer.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/3rdparty/masm/assembler/AssemblerBuffer.h
-+++ qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/AssemblerBuffer.h
+--- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/AssemblerBuffer.h
++++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AssemblerBuffer.h
 @@ -86,6 +86,14 @@ namespace JSC {
                  grow();
          }
@@ -71,10 +83,10 @@
          bool isAligned(int alignment) const
          {
              return !(m_index & (alignment - 1));
-Index: qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/LinkBuffer.h
+Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/LinkBuffer.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/3rdparty/masm/assembler/LinkBuffer.h
-+++ qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/LinkBuffer.h
+--- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/LinkBuffer.h
++++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/LinkBuffer.h
 @@ -109,11 +109,13 @@ public:
      
      // These methods are used to link or set values at code generation time.
@@ -90,10 +102,10 @@
      }
      
      void link(Jump jump, CodeLocationLabel label)
-Index: qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/X86Assembler.h
+Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/X86Assembler.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/3rdparty/masm/assembler/X86Assembler.h
-+++ qtdeclarative-opensource-src-5.3.2/src/3rdparty/masm/assembler/X86Assembler.h
+--- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/X86Assembler.h
++++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/X86Assembler.h
 @@ -101,6 +101,11 @@ public:
          ConditionNC = ConditionAE,
      } Condition;
@@ -114,10 +126,10 @@
  
          PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData, void* ownerUID, JITCompilationEffort effort)
          {
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/compiler/compiler.pri
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/compiler.pri
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/compiler/compiler.pri
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/compiler/compiler.pri
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/compiler.pri
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/compiler.pri
 @@ -28,10 +28,10 @@ HEADERS += \
      $$PWD/qv4isel_moth_p.h \
      $$PWD/qv4instr_moth_p.h
@@ -130,14 +142,14 @@
  
 +DEFINES += V4_UNIT_CACHE
  }
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qqmlirbuilder.cpp
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmlirbuilder.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/compiler/qqmlirbuilder.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qqmlirbuilder.cpp
-@@ -1512,7 +1512,12 @@ bool IRBuilder::isStatementNodeScript(QQ
- QV4::CompiledData::QmlUnit *QmlUnitGenerator::generate(Document &output)
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qqmlirbuilder.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmlirbuilder.cpp
+@@ -1502,7 +1502,12 @@ bool IRBuilder::isStatementNodeScript(QQ
+ QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output)
  {
-     QV4::CompiledData::CompilationUnit *compilationUnit = output.javaScriptCompilationUnit;
+     QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit = output.javaScriptCompilationUnit;
 -    QV4::CompiledData::Unit *jsUnit = compilationUnit->createUnitData(&output);
 +    QV4::CompiledData::Unit *jsUnit;
 +    if (!compilationUnit->data)
@@ -148,19 +160,63 @@
      const uint unitSize = jsUnit->unitSize;
  
      const int importSize = sizeof(QV4::CompiledData::Import) * output.imports.count();
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qqmltypecompiler.cpp
+@@ -1527,7 +1532,6 @@ QV4::CompiledData::Unit *QmlUnitGenerato
+     memcpy(data, jsUnit, unitSize);
+     if (jsUnit != compilationUnit->data)
+         free(jsUnit);
+-    jsUnit = 0;
+ 
+     QV4::CompiledData::Unit *qmlUnit = reinterpret_cast<QV4::CompiledData::Unit *>(data);
+     qmlUnit->unitSize = totalSize;
+@@ -1538,8 +1542,22 @@ QV4::CompiledData::Unit *QmlUnitGenerato
+     qmlUnit->offsetToObjects = unitSize + importSize;
+     qmlUnit->nObjects = output.objects.count();
+     qmlUnit->indexOfRootObject = output.indexOfRootObject;
++
++#ifdef ENABLE_UNIT_CACHE
++    if (compilationUnit->isRestored) {
++        qmlUnit->offsetToStringTable = jsUnit->offsetToStringTable;
++        qmlUnit->stringTableSize = jsUnit->stringTableSize;
++    } else {
++        qmlUnit->offsetToStringTable = totalSize - output.jsGenerator.stringTable.sizeOfTableAndData();
++        qmlUnit->stringTableSize = output.jsGenerator.stringTable.stringCount();
++    }
++#else
+     qmlUnit->offsetToStringTable = totalSize - output.jsGenerator.stringTable.sizeOfTableAndData();
+     qmlUnit->stringTableSize = output.jsGenerator.stringTable.stringCount();
++#endif
++
++    // Release
++    jsUnit = 0;
+ 
+     // write imports
+     char *importPtr = data + qmlUnit->offsetToImports;
+@@ -1631,7 +1649,12 @@ QV4::CompiledData::Unit *QmlUnitGenerato
+         }
+     }
+ 
++#ifdef ENABLE_UNIT_CACHE
++    if (!compilationUnit->isRestored)
++        output.jsGenerator.stringTable.serialize(qmlUnit);
++#else
+     output.jsGenerator.stringTable.serialize(qmlUnit);
++#endif
+ 
+     return qmlUnit;
+ }
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/compiler/qqmltypecompiler.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qqmltypecompiler.cpp
-@@ -226,6 +226,7 @@ bool QQmlTypeCompiler::compile()
-         QV4::ExecutionEngine *v4 = engine->v4engine();
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qqmltypecompiler.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler.cpp
+@@ -219,6 +219,7 @@ bool QQmlTypeCompiler::compile()
          QScopedPointer<QV4::EvalInstructionSelection> isel(v4->iselFactory->create(engine, v4->executableAllocator, &document->jsModule, &document->jsGenerator));
          isel->setUseFastLookups(false);
+         isel->setUseTypeInference(true);
 +        isel->setEngine(engine);
          document->javaScriptCompilationUnit = isel->compile(/*generated unit data*/false);
      }
  
-@@ -435,6 +436,7 @@ QQmlPropertyCacheCreator::QQmlPropertyCa
+@@ -419,6 +420,7 @@ QQmlPropertyCacheCreator::QQmlPropertyCa
      , qmlObjects(*typeCompiler->qmlObjects())
      , imports(typeCompiler->imports())
      , resolvedTypes(typeCompiler->resolvedTypes())
@@ -168,11 +224,11 @@
  {
  }
  
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qqmltypecompiler_p.h
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler_p.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/compiler/qqmltypecompiler_p.h
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qqmltypecompiler_p.h
-@@ -149,6 +149,7 @@ protected:
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qqmltypecompiler_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler_p.h
+@@ -140,6 +140,7 @@ protected:
      QHash<int, QQmlCompiledData::TypeReference*> *resolvedTypes;
      QVector<QByteArray> vmeMetaObjects;
      QVector<QQmlPropertyCache*> propertyCaches;
@@ -180,61 +236,64 @@
  };
  
  // "Converts" signal expressions to full-fleged function declarations with
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qv4compileddata_p.h
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4compileddata_p.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/compiler/qv4compileddata_p.h
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qv4compileddata_p.h
-@@ -607,6 +607,9 @@ struct Q_QML_PRIVATE_EXPORT CompilationU
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4compileddata_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4compileddata_p.h
+@@ -594,6 +594,11 @@ struct Q_QML_PRIVATE_EXPORT CompilationU
      QV4::InternalClass **runtimeClasses;
      QVector<QV4::Function *> runtimeFunctions;
  
++#ifdef ENABLE_UNIT_CACHE
 +    QVector<int> lookupTable;
 +    bool isRestored;
++#endif
 +
      QV4::Function *linkToEngine(QV4::ExecutionEngine *engine);
      void unlink();
  
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qv4isel_moth_p.h
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth_p.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/compiler/qv4isel_moth_p.h
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qv4isel_moth_p.h
-@@ -72,6 +72,7 @@ public:
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4isel_moth_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth_p.h
+@@ -64,9 +64,11 @@ public:
      ~InstructionSelection();
  
      virtual void run(int functionIndex);
-+    virtual QV4::JIT::InstructionSelection* impl() { return NULL; };;
++    virtual QV4::JIT::InstructionSelection* impl() { return NULL; };
  
  protected:
-     virtual QV4::CompiledData::CompilationUnit *backendCompileStep();
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qv4isel_p.cpp
+     virtual QQmlRefPointer<CompiledData::CompilationUnit> backendCompileStep();
++    virtual QV4::CompiledData::CompilationUnit* mutableCompilationUnit();
+ 
+     virtual void visitJump(IR::Jump *);
+     virtual void visitCJump(IR::CJump *);
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/compiler/qv4isel_p.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qv4isel_p.cpp
-@@ -1,8 +1,14 @@
--/****************************************************************************
-+/***************************************************************************
- **
- ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4isel_p.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
+@@ -3,6 +3,12 @@
+ ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
-+** Copyright (C) 2014 Nomovok Ltd. All rights reserved.
++** Copyright (C) 2015 Nomovok Ltd. All rights reserved.
 +** Contact: [e-mail]
 +**
-+** Copyright (C) 2014 Canonical Limited and/or its subsidiary(-ies).
++** Copyright (C) 2015 Canonical Limited and/or its subsidiary(-ies).
 +** Contact: [e-mail]
 +**
  ** This file is part of the QtQml module of the Qt Toolkit.
  **
- ** $QT_BEGIN_LICENSE:LGPL$
-@@ -49,6 +55,54 @@
+ ** $QT_BEGIN_LICENSE:LGPL21$
+@@ -41,6 +47,54 @@
  
  #include <QString>
  
-+#ifndef V4_ENABLE_JIT
-+#undef V4_UNIT_CACHE
++#ifndef V4_UNIT_CACHE
++#undef ENABLE_UNIT_CACHE
 +#endif
 +
-+#ifdef V4_UNIT_CACHE
++#ifdef ENABLE_UNIT_CACHE
 +#include <private/qqmltypenamecache_p.h>
 +#include <private/qqmlcompiler_p.h>
 +#include <private/qqmltypeloader_p.h>
@@ -281,7 +340,7 @@
  namespace {
  Q_GLOBAL_STATIC_WITH_ARGS(QTextStream, qout, (stderr, QIODevice::WriteOnly));
  #define qout *qout()
-@@ -57,6 +111,14 @@ Q_GLOBAL_STATIC_WITH_ARGS(QTextStream, q
+@@ -49,6 +103,14 @@ Q_GLOBAL_STATIC_WITH_ARGS(QTextStream, q
  using namespace QV4;
  using namespace QV4::IR;
  
@@ -295,8 +354,8 @@
 +
  EvalInstructionSelection::EvalInstructionSelection(QV4::ExecutableAllocator *execAllocator, Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator)
      : useFastLookups(true)
-     , executableAllocator(execAllocator)
-@@ -71,6 +133,9 @@ EvalInstructionSelection::EvalInstructio
+     , useTypeInference(true)
+@@ -64,6 +126,9 @@ EvalInstructionSelection::EvalInstructio
      Q_ASSERT(execAllocator);
  #endif
      Q_ASSERT(module);
@@ -306,45 +365,45 @@
  }
  
  EvalInstructionSelection::~EvalInstructionSelection()
-@@ -79,17 +144,306 @@ EvalInstructionSelection::~EvalInstructi
+@@ -72,15 +137,307 @@ EvalInstructionSelection::~EvalInstructi
  EvalISelFactory::~EvalISelFactory()
  {}
  
--QV4::CompiledData::CompilationUnit *EvalInstructionSelection::compile(bool generateUnitData)
-+QV4::CompiledData::CompilationUnit *EvalInstructionSelection::runAll(bool generateUnitData)
+-QQmlRefPointer<CompiledData::CompilationUnit> EvalInstructionSelection::compile(bool generateUnitData)
++QQmlRefPointer<QV4::CompiledData::CompilationUnit> EvalInstructionSelection::runAll(bool generateUnitData)
  {
 -    for (int i = 0; i < irModule->functions.size(); ++i)
 -        run(i);
-+    QV4::CompiledData::CompilationUnit *unit;
-+
 +    for (int i = 0; i < irModule->functions.size(); ++i) {
 +        run(i); // Performs the actual compilation
 +    }
 +
-+    unit = backendCompileStep();
++    QQmlRefPointer<QV4::CompiledData::CompilationUnit> result = backendCompileStep();
 +
-+#ifdef V4_UNIT_CACHE
-+    unit->isRestored = false;
++#ifdef ENABLE_UNIT_CACHE
++    result->isRestored = false;
 +#endif
  
--    QV4::CompiledData::CompilationUnit *unit = backendCompileStep();
+-    QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit = backendCompileStep();
      if (generateUnitData)
-         unit->data = jsGenerator->generateUnit();
-+
-     return unit;
- }
- 
-+QV4::CompiledData::CompilationUnit *EvalInstructionSelection::compile(bool generateUnitData)
++        result->data = jsGenerator->generateUnit();
++
++    return result;
++}
++
++QQmlRefPointer<QV4::CompiledData::CompilationUnit> EvalInstructionSelection::compile(bool generateUnitData)
 +{
-+#ifndef V4_UNIT_CACHE
++#ifndef ENABLE_UNIT_CACHE
 +    return runAll(generateUnitData);
 +#else
++    QQmlRefPointer<QV4::CompiledData::CompilationUnit> result(nullptr);
++
 +    // Check if running JIT mode and if cache is enabled
-+    if (!do_cache || !this->impl())
++    if (!do_cache || !this->impl()) {
 +        return runAll(generateUnitData);
++    }
 +
 +    QV4::CompiledData::CompilationUnit *unit;
-+
 +    bool loaded = false;
 +    bool do_save = true;
 +
@@ -433,10 +492,9 @@
 +    // This code has been inspired and influenced by Nomovok's QMLC compiler available at
 +    // https://github.com/qmlc/qmlc. All original Copyrights are maintained for the
 +    // basic code snippets.
-+
 +    if (loaded) {
 +        // Retrieve unit skeleton from isel implementation
-+        unit = backendCompileStep();
++        unit = mutableCompilationUnit();
 +        QV4::JIT::CompilationUnit *tmpUnit = (QV4::JIT::CompilationUnit *) unit;
 +        tmpUnit->codeRefs.resize(irModule->functions.size());
 +
@@ -496,7 +554,7 @@
 +
 +            QV4::IR::Function nullFunction(0, 0, QLatin1String(""));
 +
-+            QV4::JIT::Assembler* as = new QV4::JIT::Assembler(this->impl(), &nullFunction, executableAllocator, 6);
++            QV4::JIT::Assembler* as = new QV4::JIT::Assembler(this->impl(), &nullFunction, executableAllocator);
 +
 +            QList<QV4::JIT::Assembler::CallToLink>& callsToLink = as->callsToLink();
 +            for (int i = 0; i < linkCalls.size(); i++) {
@@ -531,18 +589,22 @@
 +        if (size > 0)
 +            readData((char *)dataPtr, size, stream);
 +
++        result = backendCompileStep();
++        unit = result.data();
++
 +        unit->data = nullptr;
 +        if (irModule->functions.size() > 0)
 +            unit->data = finalUnit;
-+
 +        unit->isRestored = true;
 +    } else {
 +        // Not loading from cache, run all instructions
-+        unit = runAll(false);
++        result = runAll(false);
++        unit = result.data();
 +    }
 +
 +    if ((unit->data == nullptr) && (do_save || generateUnitData))
-+        unit->data = jsGenerator->generateUnit();
+         unit->data = jsGenerator->generateUnit();
+-    return unit;
 +
 +    // Save compilation unit
 +    QV4::JIT::CompilationUnit *jitUnit = (QV4::JIT::CompilationUnit *) unit;
@@ -610,18 +672,17 @@
 +            cacheFile.close();
 +        }
 +    }
-+    return unit;
++
++    return result;
 +#endif
-+}
-+
+ }
+ 
  void IRDecoder::visitMove(IR::Move *s)
- {
-     if (IR::Name *n = s->target->asName()) {
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qv4isel_p.h
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/compiler/qv4isel_p.h
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/compiler/qv4isel_p.h
-@@ -56,6 +56,10 @@ class QQmlEnginePrivate;
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4isel_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.h
+@@ -48,6 +48,10 @@ class QQmlEnginePrivate;
  
  namespace QV4 {
  
@@ -632,15 +693,15 @@
  class ExecutableAllocator;
  struct Function;
  
-@@ -65,6 +69,7 @@ public:
+@@ -57,6 +61,7 @@ public:
      EvalInstructionSelection(QV4::ExecutableAllocator *execAllocator, IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator);
      virtual ~EvalInstructionSelection() = 0;
  
-+    QV4::CompiledData::CompilationUnit *runAll(bool generateUnitData);
-     QV4::CompiledData::CompilationUnit *compile(bool generateUnitData = true);
++    QQmlRefPointer<QV4::CompiledData::CompilationUnit> runAll(bool generateUnitData);
+     QQmlRefPointer<QV4::CompiledData::CompilationUnit> compile(bool generateUnitData = true);
  
      void setUseFastLookups(bool b) { useFastLookups = b; }
-@@ -78,9 +83,11 @@ public:
+@@ -71,10 +76,13 @@ public:
      int registerRegExp(IR::RegExp *regexp) { return jsGenerator->registerRegExp(regexp); }
      int registerJSClass(int count, IR::ExprList *args) { return jsGenerator->registerJSClass(count, args); }
      QV4::Compiler::JSUnitGenerator *jsUnitGenerator() const { return jsGenerator; }
@@ -649,10 +710,12 @@
  protected:
      virtual void run(int functionIndex) = 0;
 +    virtual QV4::JIT::InstructionSelection* impl() = 0;
-     virtual QV4::CompiledData::CompilationUnit *backendCompileStep() = 0;
+     virtual QQmlRefPointer<QV4::CompiledData::CompilationUnit> backendCompileStep() = 0;
++    virtual QV4::CompiledData::CompilationUnit* mutableCompilationUnit() = 0;
  
      bool useFastLookups;
-@@ -88,6 +95,7 @@ protected:
+     bool useTypeInference;
+@@ -82,6 +90,7 @@ protected:
      QV4::Compiler::JSUnitGenerator *jsGenerator;
      QScopedPointer<QV4::Compiler::JSUnitGenerator> ownJSGenerator;
      IR::Module *irModule;
@@ -660,27 +723,32 @@
  };
  
  class Q_QML_PRIVATE_EXPORT EvalISelFactory
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4assembler.cpp
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/jit/qv4assembler.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4assembler.cpp
-@@ -77,7 +77,10 @@ void CompilationUnit::linkBackendToEngin
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jit/qv4assembler.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler.cpp
+@@ -69,7 +69,15 @@ void CompilationUnit::linkBackendToEngin
  
          QV4::Function *runtimeFunction = new QV4::Function(engine, this, compiledFunction,
                                                             (ReturnedValue (*)(QV4::ExecutionContext *, const uchar *)) codeRefs[i].code().executableAddress());
 -        runtimeFunctions[i] = runtimeFunction;
++
++#if ENABLE_UNIT_CACHE
 +        if (isRestored)
 +            runtimeFunctions[lookupTable.at(i)] = runtimeFunction;
 +        else
 +            runtimeFunctions[i] = runtimeFunction;
++#else
++    runtimeFunctions[i] = runtimeFunction;
++#endif
      }
  }
  
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4assembler_p.h
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler_p.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/jit/qv4assembler_p.h
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4assembler_p.h
-@@ -70,6 +70,16 @@ namespace JIT {
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jit/qv4assembler_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler_p.h
+@@ -63,6 +63,16 @@ namespace JIT {
  
  class InstructionSelection;
  
@@ -697,7 +765,7 @@
  struct CompilationUnit : public QV4::CompiledData::CompilationUnit
  {
      virtual ~CompilationUnit();
-@@ -82,6 +92,8 @@ struct CompilationUnit : public QV4::Com
+@@ -75,6 +85,8 @@ struct CompilationUnit : public QV4::Com
  
      QVector<JSC::MacroAssemblerCodeRef> codeRefs;
      QList<QVector<QV4::Primitive> > constantValues;
@@ -706,7 +774,7 @@
  };
  
  struct RelativeCall {
-@@ -1151,7 +1163,12 @@ public:
+@@ -1064,7 +1076,12 @@ public:
              move(TrustedImm64(u.i), ReturnValueRegister);
              move64ToDouble(ReturnValueRegister, target);
  #else
@@ -720,7 +788,7 @@
  #endif
              return target;
          }
-@@ -1241,6 +1258,12 @@ public:
+@@ -1152,6 +1169,12 @@ public:
      Label exceptionReturnLabel;
      IR::BasicBlock * catchBlock;
      QVector<Jump> exceptionPropagationJumps;
@@ -731,12 +799,12 @@
 +    QList<CallToLink>& callsToLink() { return _callsToLink; }
 +
  private:
-     const StackLayout _stackLayout;
+     QScopedPointer<const StackLayout> _stackLayout;
      ConstantTable _constTable;
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4cachedlinkdata_p.h
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4cachedlinkdata_p.h
 ===================================================================
 --- /dev/null
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4cachedlinkdata_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4cachedlinkdata_p.h
 @@ -0,0 +1,188 @@
 +/***************************************************************************
 +**
@@ -926,11 +994,11 @@
 +QT_END_NAMESPACE
 +
 +#endif
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4isel_masm.cpp
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/jit/qv4isel_masm.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4isel_masm.cpp
-@@ -51,6 +51,7 @@
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jit/qv4isel_masm.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm.cpp
+@@ -43,6 +43,7 @@
  #include "qv4assembler_p.h"
  #include "qv4unop_p.h"
  #include "qv4binop_p.h"
@@ -938,7 +1006,7 @@
  
  #include <QtCore/QBuffer>
  
-@@ -147,9 +148,13 @@ JSC::MacroAssemblerCodeRef Assembler::li
+@@ -139,9 +140,13 @@ JSC::MacroAssemblerCodeRef Assembler::li
      JSC::LinkBuffer linkBuffer(dummy, this, 0);
  
      QHash<void*, const char*> functions;
@@ -953,7 +1021,7 @@
      }
  
      foreach (const DataLabelPatch &p, _dataLabelPatches)
-@@ -367,6 +372,25 @@ void InstructionSelection::run(int funct
+@@ -277,6 +282,25 @@ void InstructionSelection::run(int funct
      JSC::MacroAssemblerCodeRef codeRef =_as->link(&dummySize);
      compilationUnit->codeRefs[functionIndex] = codeRef;
  
@@ -979,42 +1047,57 @@
      qSwap(_function, function);
      delete _as;
      _as = oldAssembler;
-@@ -1828,5 +1852,4 @@ void InstructionSelection::visitCJumpEqu
+@@ -300,6 +324,11 @@ QQmlRefPointer<QV4::CompiledData::Compil
+     return result;
+ }
+ 
++QV4::CompiledData::CompilationUnit* InstructionSelection::mutableCompilationUnit()
++{
++    return compilationUnit.data();
++}
++
+ void InstructionSelection::callBuiltinInvalid(IR::Name *func, IR::ExprList *args, IR::Expr *result)
+ {
+     prepareCallData(args, 0);
+@@ -1800,5 +1829,4 @@ void InstructionSelection::visitCJumpEqu
                                  _block, trueBlock, falseBlock);
  }
  
 -
  #endif // ENABLE(ASSEMBLER)
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4isel_masm_p.h
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm_p.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/jit/qv4isel_masm_p.h
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/jit/qv4isel_masm_p.h
-@@ -73,6 +73,8 @@ public:
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jit/qv4isel_masm_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm_p.h
+@@ -65,8 +65,11 @@ public:
      virtual void run(int functionIndex);
  
      const void *addConstantTable(QVector<QV4::Primitive> *values);
 +
 +    virtual InstructionSelection* impl() { return this; };
  protected:
-     virtual QV4::CompiledData::CompilationUnit *backendCompileStep();
+     virtual QQmlRefPointer<QV4::CompiledData::CompilationUnit> backendCompileStep();
++    virtual QV4::CompiledData::CompilationUnit* mutableCompilationUnit();
  
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/jsruntime/qv4functionobject.cpp
+     virtual void callBuiltinInvalid(IR::Name *func, IR::ExprList *args, IR::Expr *result);
+     virtual void callBuiltinTypeofMember(IR::Expr *base, const QString &name, IR::Expr *result);
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4functionobject.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/jsruntime/qv4functionobject.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/jsruntime/qv4functionobject.cpp
-@@ -234,6 +234,7 @@ ReturnedValue FunctionCtor::construct(Ma
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jsruntime/qv4functionobject.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4functionobject.cpp
+@@ -226,6 +226,7 @@ ReturnedValue FunctionCtor::construct(Ma
  
      QV4::Compiler::JSUnitGenerator jsGenerator(&module);
      QScopedPointer<EvalInstructionSelection> isel(v4->iselFactory->create(QQmlEnginePrivate::get(v4), v4->executableAllocator, &module, &jsGenerator));
 +    isel->setEngine(QQmlEnginePrivate::get(v4));
-     QV4::CompiledData::CompilationUnit *compilationUnit = isel->compile();
+     QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit = isel->compile();
      QV4::Function *vmf = compilationUnit->linkToEngine(v4);
  
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/jsruntime/qv4qobjectwrapper.cpp
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4qobjectwrapper.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/jsruntime/qv4qobjectwrapper.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/jsruntime/qv4qobjectwrapper.cpp
-@@ -628,6 +628,7 @@ ReturnedValue QObjectWrapper::getPropert
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jsruntime/qv4qobjectwrapper.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4qobjectwrapper.cpp
+@@ -629,6 +629,7 @@ ReturnedValue QObjectWrapper::getPropert
      QQmlPropertyCache *cache = ddata->propertyCache;
      Q_ASSERT(cache);
      QQmlPropertyData *property = cache->property(propertyIndex);
@@ -1022,19 +1105,19 @@
      Q_ASSERT(property); // We resolved this property earlier, so it better exist!
      return getProperty(object, ctx, property, captureRequired);
  }
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/jsruntime/qv4script.cpp
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4script.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/jsruntime/qv4script.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/jsruntime/qv4script.cpp
-@@ -272,6 +272,7 @@ void Script::parse()
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jsruntime/qv4script.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4script.cpp
+@@ -259,6 +259,7 @@ void Script::parse()
          QScopedPointer<EvalInstructionSelection> isel(v4->iselFactory->create(QQmlEnginePrivate::get(v4), v4->executableAllocator, &module, &jsGenerator));
          if (inheritContext)
              isel->setUseFastLookups(false);
 +        isel->setEngine(QQmlEnginePrivate::get(v4));
-         QV4::CompiledData::CompilationUnit *compilationUnit = isel->compile();
+         QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit = isel->compile();
          vmFunction = compilationUnit->linkToEngine(v4);
-         ScopedValue holder(valueScope, new (v4->memoryManager) CompilationUnitHolder(v4, compilationUnit));
-@@ -394,6 +395,7 @@ QV4::CompiledData::CompilationUnit *Scri
+         ScopedObject holder(valueScope, v4->memoryManager->alloc<CompilationUnitHolder>(v4, compilationUnit));
+@@ -360,6 +361,7 @@ QQmlRefPointer<QV4::CompiledData::Compil
  
      QScopedPointer<EvalInstructionSelection> isel(engine->iselFactory->create(QQmlEnginePrivate::get(engine), engine->executableAllocator, module, unitGenerator));
      isel->setUseFastLookups(false);
@@ -1042,11 +1125,11 @@
      return isel->compile(/*generate unit data*/false);
  }
  
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/qml/qqmlengine.cpp
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/qml/qqmlengine.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/qml/qqmlengine.cpp
-@@ -561,7 +561,8 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQm
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/qml/qqmlengine.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine.cpp
+@@ -559,7 +559,8 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQm
    activeObjectCreator(0),
    networkAccessManager(0), networkAccessManagerFactory(0), urlInterceptor(0),
    scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1),
@@ -1056,12 +1139,12 @@
  {
      useNewCompiler = true;
  }
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/qml/qqmlengine_p.h
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine_p.h
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/qml/qqmlengine_p.h
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/qml/qqmlengine_p.h
-@@ -270,6 +270,8 @@ public:
- 
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/qml/qqmlengine_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine_p.h
+@@ -263,6 +263,8 @@ public:
+     mutable QMutex networkAccessManagerMutex;
      mutable QMutex mutex;
  
 +    int qmlCacheValid;
@@ -1069,11 +1152,11 @@
  private:
      // Locker locks the QQmlEnginePrivate data structures for read and write, if necessary.
      // Currently, locking is only necessary if the threaded loader is running concurrently.  If it is
-Index: qtdeclarative-opensource-src-5.3.2/src/qml/qml/qqmljavascriptexpression.cpp
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmljavascriptexpression.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.3.2.orig/src/qml/qml/qqmljavascriptexpression.cpp
-+++ qtdeclarative-opensource-src-5.3.2/src/qml/qml/qqmljavascriptexpression.cpp
-@@ -335,6 +335,7 @@ QV4::ReturnedValue QQmlJavaScriptExpress
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/qml/qqmljavascriptexpression.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmljavascriptexpression.cpp
+@@ -327,6 +327,7 @@ QV4::ReturnedValue QQmlJavaScriptExpress
  
      QV4::ScopedObject qmlScopeObject(scope, QV4::QmlContextWrapper::qmlScope(ep->v8engine(), ctxt, qmlScope));
      QV4::Script script(v4, qmlScopeObject, code, filename, line);
@@ -1081,3 +1164,33 @@
      QV4::ScopedValue result(scope);
      script.parse();
      if (!v4->hasException)
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth.cpp
+===================================================================
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4isel_moth.cpp
++++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth.cpp
+@@ -457,6 +457,11 @@ QQmlRefPointer<QV4::CompiledData::Compil
+     return result;
+ }
+ 
++QV4::CompiledData::CompilationUnit* InstructionSelection::mutableCompilationUnit()
++{
++    return compilationUnit.data();
++}
++
+ void InstructionSelection::callValue(IR::Expr *value, IR::ExprList *args, IR::Expr *result)
+ {
+     Instruction::CallValue call;
+Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4global_p.h
+===================================================================
+--- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jsruntime/qv4global_p.h
++++ qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4global_p.h
+@@ -96,6 +96,9 @@ inline double trunc(double d) { return d
+ #define ENABLE_YARR_JIT 1
+ #define ENABLE_JIT 1
+ #define ENABLE_ASSEMBLER 1
++#if defined(V4_UNIT_CACHE)
++    #define ENABLE_UNIT_CACHE 1
++#endif
+ #else
+ #define ENABLE_YARR_JIT 0
+ #define ENABLE_ASSEMBLER 0
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-02-10 12:14:13 +0000
+++ debian/patches/series	2015-02-26 09:47:31 +0000
@@ -4,4 +4,4 @@
 ppc64el.patch
 Support-RFC2822Date-date-format-similar-to-V8.patch
 Fix-regression-where-QQuickScreenAttached-overwrites.patch
-#QML-Compilation-unit-caching-and-JIT-changes.patch
+QML-Compilation-unit-caching-and-JIT-changes.patch
 
=== modified file 'debian/rules'
--- debian/rules	2015-02-04 15:00:17 +0000
+++ debian/rules	2015-02-26 09:47:31 +0000
@@ -4,12 +4,16 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
+# Skip tests on the archs they are known to be flaky with current configuration
+testskip_architectures := powerpc
+
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg
 
@@ -64,5 +68,8 @@
 	cp -a src/imports/testlib/TestCase.qml qml/QtTest
 	cp -a src/imports/testlib/SignalSpy.qml qml/QtTest
 	cp -a src/imports/testlib/testlogger.js qml/QtTest
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	xvfb-run -a -s "-screen 0 1024x768x24" dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/qml
-
+endif
+endif