Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	tools/qmljs/qmljs.cpp

Change-Id: Ifa9e74bdb780eaff22fbc9ba1c514d0078a3fb29

7 files changed, 47 insertions, 12 deletions

diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 8f68131ced..90cbe04505 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -71,7 +71,7 @@
 QT_BEGIN_NAMESPACE
 
 // Bump this whenever the compiler data structures change in an incompatible way.
-#define QV4_DATA_STRUCTURE_VERSION 0x06
+#define QV4_DATA_STRUCTURE_VERSION 0x07
 
 class QIODevice;
 class QQmlPropertyCache;
@@ -587,7 +587,7 @@ struct Import
         ImportFile = 0x2,
         ImportScript = 0x3
     };
-    quint8 type;
+    LEUInt32 type;
 
     LEUInt32 uriIndex;
     LEUInt32 qualifierIndex;
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index b83bcdb83b..ca4e0b73d4 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -253,6 +253,7 @@ union Instr
 {
     enum Type {
         FOR_EACH_MOTH_INSTR(MOTH_INSTR_ENUM)
+        LastInstruction
     };
 
     struct instr_common {
diff --git a/src/qml/compiler/qv4isel_moth.cpp b/src/qml/compiler/qv4isel_moth.cpp
index 5dd722bfc2..1f5c22eb97 100644
--- a/src/qml/compiler/qv4isel_moth.cpp
+++ b/src/qml/compiler/qv4isel_moth.cpp
@@ -1477,6 +1477,17 @@ bool CompilationUnit::saveCodeToDisk(QIODevice *device, const CompiledData::Unit
 
     QByteArray padding;
 
+#ifdef MOTH_THREADED_INTERPRETER
+    // Map from instruction label back to instruction type. Only needed when persisting
+    // already linked compilation units;
+    QHash<void*, int> reverseInstructionMapping;
+    if (engine) {
+        void **instructions = VME::instructionJumpTable();
+        for (int i = 0; i < Instr::LastInstruction; ++i)
+            reverseInstructionMapping.insert(instructions[i], i);
+    }
+#endif
+
     for (int i = 0; i < codeRefs.size(); ++i) {
         const CompiledData::Function *compiledFunction = unit->functionAt(i);
 
@@ -1493,8 +1504,30 @@ bool CompilationUnit::saveCodeToDisk(QIODevice *device, const CompiledData::Unit
             return false;
         }
 
-        const void *codePtr = codeRefs.at(i).constData();
-        written = device->write(reinterpret_cast<const char *>(codePtr), compiledFunction->codeSize);
+        QByteArray code = codeRefs.at(i);
+
+#ifdef MOTH_THREADED_INTERPRETER
+        if (!reverseInstructionMapping.isEmpty()) {
+            char *codePtr = code.data(); // detaches
+            int index = 0;
+            while (index < code.size()) {
+                Instr *genericInstr = reinterpret_cast<Instr *>(codePtr + index);
+
+                genericInstr->common.instructionType = reverseInstructionMapping.value(genericInstr->common.code);
+
+                switch (genericInstr->common.instructionType) {
+    #define REVERSE_INSTRUCTION(InstructionType, Member) \
+                case Instr::InstructionType: \
+                    index += InstrMeta<(int)Instr::InstructionType>::Size; \
+                break;
+
+                FOR_EACH_MOTH_INSTR(REVERSE_INSTRUCTION)
+                }
+            }
+        }
+#endif
+
+        written = device->write(code.constData(), compiledFunction->codeSize);
         if (written != qint64(compiledFunction->codeSize)) {
             *errorString = device->errorString();
             return false;
diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
index a98cf6d338..4fa0cf421b 100644
--- a/src/qml/compiler/qv4ssa.cpp
+++ b/src/qml/compiler/qv4ssa.cpp
@@ -5077,6 +5077,10 @@ void mergeBasicBlocks(IR::Function *function, DefUses *du, DominatorTree *dt)
         BasicBlock *successor = bb->out.first();
         if (successor->in.size() != 1) continue; // more than one incoming edge
 
+        // Loop header? No efficient way to update the other blocks that refer to this as containing group,
+        // so don't do merging yet.
+        if (successor->isGroupStart()) continue;
+
         // Ok, we can merge the two basic blocks.
         if (DebugBlockMerging) {
             qDebug("Merging L%d into L%d", successor->index(), bb->index());
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index cc2fe90483..ac6600f38c 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -52,8 +52,8 @@ remain with C++ by invoking QQmlEngine::setObjectOwnership() with
 QQmlEngine::CppOwnership specified.
 
 Additionally, the QML engine respects the normal QObject parent ownership
-semantics of Qt C++ objects, and will not ever take ownership of a QObject
-instance which already has a parent.
+semantics of Qt C++ objects, and will never delete a QObject instance which
+has a parent.
 
 
 \section1 Basic Qt Data Types
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 4428c48d80..6d5cff4ecc 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -175,10 +175,7 @@ public:
     Q_ALWAYS_INLINE quint32 value() const { return _val & quint64(~quint32(0)); }
     Q_ALWAYS_INLINE quint32 tag() const { return _val >> 32; }
 
-#if defined(V4_BOOTSTRAP)
-    Q_ALWAYS_INLINE Heap::Base *m() const { Q_UNREACHABLE(); return Q_NULLPTR; }
-    Q_ALWAYS_INLINE void setM(Heap::Base *b) { Q_UNUSED(b); Q_UNREACHABLE(); }
-#elif defined(QV4_USE_64_BIT_VALUE_ENCODING)
+#if defined(QV4_USE_64_BIT_VALUE_ENCODING)
     Q_ALWAYS_INLINE Heap::Base *m() const
     {
         Heap::Base *b;
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index b820777973..630d04938a 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -468,7 +468,7 @@ private:
 
     QQmlPropertyData *ensureResolved(QQmlPropertyData*) const;
 
-    void resolve(QQmlPropertyData *) const;
+    Q_NEVER_INLINE void resolve(QQmlPropertyData *) const;
     void updateRecur(const QMetaObject *);
 
     template<typename K>
@@ -677,7 +677,7 @@ bool QQmlPropertyData::operator==(const QQmlPropertyRawData &other)
 
 inline QQmlPropertyData *QQmlPropertyCache::ensureResolved(QQmlPropertyData *p) const
 {
-    if (p && p->notFullyResolved())
+    if (p && Q_UNLIKELY(p->notFullyResolved()))
         resolve(p);
 
     return p;