4 files changed, 17 insertions, 36 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index f43d7bc06f..5217e11115 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -407,11 +407,7 @@ void ScriptDirectivesCollector::importModule(const QString &uri, const QString &
     QV4::CompiledData::Import *import = engine->pool()->New<QV4::CompiledData::Import>();
     import->type = QV4::CompiledData::Import::ImportLibrary;
     import->uriIndex = jsGenerator->registerString(uri);
-    int vmaj;
-    int vmin;
-    IRBuilder::extractVersion(QStringRef(&version), &vmaj, &vmin);
-    import->majorVersion = vmaj;
-    import->minorVersion = vmin;
+    import->version = IRBuilder::extractVersion(QStringRef(&version));
     import->qualifierIndex = jsGenerator->registerString(module);
     import->location.line = lineNumber;
     import->location.column = column;
@@ -752,16 +748,14 @@ bool IRBuilder::visit(QQmlJS::AST::UiImport *node)
     }
 
     if (node->version) {
-        import->majorVersion = node->version->majorVersion;
-        import->minorVersion = node->version->minorVersion;
+        import->version = node->version->version;
     } else if (import->type == QV4::CompiledData::Import::ImportLibrary) {
         recordError(node->importIdToken, QCoreApplication::translate("QQmlParser","Library import requires a version"));
         return false;
     } else {
         // For backward compatibility in how the imports are loaded we
-        // must otherwise initialize the major and minor version to -1.
-        import->majorVersion = -1;
-        import->minorVersion = -1;
+        // must otherwise initialize the major and minor version to invalid.
+        import->version = QTypeRevision();
     }
 
     import->location.line = node->importToken.startLine;
@@ -1055,22 +1049,15 @@ QStringRef IRBuilder::asStringRef(QQmlJS::AST::Node *node)
     return textRefAt(node->firstSourceLocation(), node->lastSourceLocation());
 }
 
-void IRBuilder::extractVersion(const QStringRef &string, int *maj, int *min)
+QTypeRevision IRBuilder::extractVersion(const QStringRef &string)
 {
-    *maj = -1; *min = -1;
+    if (string.isEmpty())
+        return QTypeRevision();
 
-    if (!string.isEmpty()) {
-
-        int dot = string.indexOf(QLatin1Char('.'));
-
-        if (dot < 0) {
-            *maj = string.toInt();
-            *min = 0;
-        } else {
-            *maj = string.left(dot).toInt();
-            *min = string.mid(dot + 1).toInt();
-        }
-    }
+    const int dot = string.indexOf(QLatin1Char('.'));
+    return (dot < 0)
+        ? QTypeRevision::fromVersion(string.toInt(), 0)
+        : QTypeRevision::fromVersion(string.left(dot).toInt(), string.mid(dot + 1).toInt());
 }
 
 QStringRef IRBuilder::textRefAt(const QQmlJS::SourceLocation &first, const QQmlJS::SourceLocation &last) const
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 8f6c623818..1f2c11f7f3 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -498,7 +498,7 @@ public:
 
     static QString asString(QQmlJS::AST::UiQualifiedId *node);
     QStringRef asStringRef(QQmlJS::AST::Node *node);
-    static void extractVersion(const QStringRef &string, int *maj, int *min);
+    static QTypeRevision extractVersion(const QStringRef &string);
     QStringRef textRefAt(const QQmlJS::SourceLocation &loc) const
     { return QStringRef(&sourceCode, loc.offset, loc.length); }
     QStringRef textRefAt(const QQmlJS::SourceLocation &first,
diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
index acc4b02e96..0c0a005689 100644
--- a/src/qml/compiler/qv4compiler.cpp
+++ b/src/qml/compiler/qv4compiler.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtQml module of the Qt Toolkit.
@@ -47,6 +48,7 @@
 #include <private/qml_compile_hash_p.h>
 #include <private/qqmlirbuilder_p.h>
 #include <QCryptographicHash>
+#include <QtEndian>
 
 // Efficient implementation that takes advantage of powers of two.
 static inline size_t roundUpToMultipleOf(size_t divisor, size_t x)
@@ -108,19 +110,11 @@ void QV4::Compiler::StringTableGenerator::serialize(CompiledData::Unit *unit)
 
         QV4::CompiledData::String *s = reinterpret_cast<QV4::CompiledData::String *>(stringData);
         Q_ASSERT(reinterpret_cast<uintptr_t>(s) % alignof(QV4::CompiledData::String) == 0);
-        s->refcount = -1;
+        Q_ASSERT(qstr.length() >= 0);
         s->size = qstr.length();
-        s->allocAndCapacityReservedFlag = 0;
-        s->offsetOn32Bit = sizeof(QV4::CompiledData::String);
-        s->offsetOn64Bit = sizeof(QV4::CompiledData::String);
 
         ushort *uc = reinterpret_cast<ushort *>(reinterpret_cast<char *>(s) + sizeof(*s));
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-        memcpy(uc, qstr.constData(), s->size * sizeof(ushort));
-#else
-        for (int i = 0; i < s->size; ++i)
-            uc[i] = qToLittleEndian<ushort>(qstr.at(i).unicode());
-#endif
+        qToLittleEndian<ushort>(qstr.constData(), s->size, uc);
         uc[s->size] = 0;
 
         stringData += QV4::CompiledData::String::calculateSize(qstr);
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index c0dd696b8a..254e1c46e9 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -348,7 +348,7 @@ QT_BEGIN_NAMESPACE
 #endif
 #endif
 
-#define MOTH_INSTR_ALIGN_MASK (Q_ALIGNOF(QV4::Moth::Instr) - 1)
+#define MOTH_INSTR_ALIGN_MASK (alignof(QV4::Moth::Instr) - 1)
 
 #define MOTH_INSTR_ENUM(I)  I, I##_Wide,
 #define MOTH_INSTR_SIZE(I) (sizeof(QV4::Moth::Instr::instr_##I))