QmlCompiler: Support more integer types

This adds support for 8- and 16-bit signed and unsigned integer types.
The test exposes that the engine fails to correctly convert out of range
values when assigning to a 32-bit int property. Fix that as drive-by.

Fixes: QTBUG-101634
Change-Id: I0a4177f49ffc062a1f444e30424e94c1f293e70c
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>

2 files changed, 112 insertions, 13 deletions

diff --git a/tests/auto/qml/qmlcppcodegen/data/numbersInJsPrimitive.qml b/tests/auto/qml/qmlcppcodegen/data/numbersInJsPrimitive.qml
index f12d3f5ea2..ec848429e8 100644
--- a/tests/auto/qml/qmlcppcodegen/data/numbersInJsPrimitive.qml
+++ b/tests/auto/qml/qmlcppcodegen/data/numbersInJsPrimitive.qml
@@ -4,23 +4,57 @@ import TestTypes
 
 QtObject {
     function writeValues() {
+        Druggeljug.myInt8 = 35
+        Druggeljug.myUint8 = 36
+        Druggeljug.myInt16 = 37
+        Druggeljug.myUint16 = 38
         Druggeljug.myInt = 39
         Druggeljug.myUint = 40
         Druggeljug.myInt32 = 41
         Druggeljug.myUint32 = 42
     }
 
+    function negateValues() {
+        Druggeljug.myInt8   = -Druggeljug.myInt8;
+        Druggeljug.myUint8  = -Druggeljug.myUint8;
+        Druggeljug.myInt16  = -Druggeljug.myInt16;
+        Druggeljug.myUint16 = -Druggeljug.myUint16;
+        Druggeljug.myInt    = -Druggeljug.myInt;
+        Druggeljug.myUint   = -Druggeljug.myUint;
+        Druggeljug.myInt32  = -Druggeljug.myInt32;
+        Druggeljug.myUint32 = -Druggeljug.myUint32;
+    }
+
+    function shuffleValues() {
+        Druggeljug.myInt8   = Druggeljug.myUint8;
+        Druggeljug.myUint8  = Druggeljug.myInt16;
+        Druggeljug.myInt16  = Druggeljug.myUint16;
+        Druggeljug.myUint16 = Druggeljug.myInt;
+        Druggeljug.myInt    = Druggeljug.myUint;
+        Druggeljug.myUint   = Druggeljug.myInt32;
+        Druggeljug.myInt32  = Druggeljug.myUint32;
+        Druggeljug.myUint32 = Druggeljug.myInt8;
+    }
+
     function readValueAsString(i: int) : string {
         switch (i) {
-            case 0: return Druggeljug.myInt;
-            case 1: return Druggeljug.myUint;
-            case 2: return Druggeljug.myInt32;
-            case 3: return Druggeljug.myUint32;
+            case 0: return Druggeljug.myInt8;
+            case 1: return Druggeljug.myUint8;
+            case 2: return Druggeljug.myInt16;
+            case 3: return Druggeljug.myUint16;
+            case 4: return Druggeljug.myInt;
+            case 5: return Druggeljug.myUint;
+            case 6: return Druggeljug.myInt32;
+            case 7: return Druggeljug.myUint32;
             default: return "";
         }
     }
 
     function storeValues() {
+        Druggeljug.storeMyInt8(1330)
+        Druggeljug.storeMyUint8(1331)
+        Druggeljug.storeMyInt16(1332)
+        Druggeljug.storeMyUint16(1333)
         Druggeljug.storeMyInt(1334)
         Druggeljug.storeMyUint(1335)
         Druggeljug.storeMyInt32(1336)
diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
index 821e676786..92b8efc203 100644
--- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
+++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
@@ -3043,10 +3043,10 @@ void tst_QmlCppCodegen::lengthAccessArraySequenceCompat()
     QCOMPARE(o->property("length").toInt(), 100);
 }
 
-static QList<QString> convertToStrings(const QList<int> &ints)
+static QList<QString> convertToStrings(const QList<qint64> &ints)
 {
     QList<QString> strings;
-    for (int i : ints)
+    for (qint64 i : ints)
         strings.append(QString::number(i));
     return strings;
 }
@@ -3059,12 +3059,41 @@ void tst_QmlCppCodegen::numbersInJsPrimitive()
     QScopedPointer<QObject> o(c.create());
     QVERIFY(!o.isNull());
 
-    const QList<int> zeroes  = {0, 0, 0, 0};
-    const QList<int> written = {39, 40, 41, 42};
-    const QList<int> stored  = {1334, 1335, 1336, 1337};
-    QStringList asStrings(4);
+    const QList<qint64> zeroes
+            = {0, 0, 0, 0, 0, 0, 0, 0};
+    const QList<qint64> written
+            = {35, 36, 37, 38, 39, 40, 41, 42};
+    const QList<qint64> writtenNegative
+            = {-35, 220, -37, 65498, -39, 4294967256, -41, 4294967254};
+    const QList<QList<qint64>> writtenShuffled = {
+        { -36, 219, -38, 65497, -40, 4294967255, -42, 4294967260 },
+        { -37, 218, -39, 65496, -41, 4294967254, -36, 4294967259 },
+        { -38, 217, -40, 65495, -42, 4294967260, -37, 4294967258 },
+        { -39, 216, -41, 65494, -36, 4294967259, -38, 4294967257 },
+        { -40, 215, -42, 65500, -37, 4294967258, -39, 4294967256 },
+        { -41, 214, -36, 65499, -38, 4294967257, -40, 4294967255 },
+        { -42, 220, -37, 65498, -39, 4294967256, -41, 4294967254 },
+        { -36, 219, -38, 65497, -40, 4294967255, -42, 4294967260 },
+    };
+
+    const QList<qint64> stored
+            = {50, 51, 1332, 1333, 1334, 1335, 1336, 1337};
+    const QList<qint64> storedNegative
+            = {-50, 205, -1332, 64203, -1334, 4294965961, -1336, 4294965959};
+    const QList<QList<qint64>> storedShuffled = {
+        { -51, 204, -1333, 64202, -1335, 4294965960, -1337, 4294967245 },
+        { -52, 203, -1334, 64201, -1336, 4294965959, -51,   4294967244 },
+        { -53, 202, -1335, 64200, -1337, 4294967245, -52,   4294967243 },
+        { -54, 201, -1336, 64199, -51,   4294967244, -53,   4294967242 },
+        { -55, 200, -1337, 65485, -52,   4294967243, -54,   4294967241 },
+        { -56, 199, -51,   65484, -53,   4294967242, -55,   4294967240 },
+        { -57, 205, -52,   65483, -54,   4294967241, -56,   4294967239 },
+        { -51, 204, -53,   65482, -55,   4294967240, -57,   4294967245 },
+    };
 
-    for (int i = 0; i < 4; ++i) {
+    QStringList asStrings(8);
+
+    for (int i = 0; i < 8; ++i) {
         QMetaObject::invokeMethod(
                     o.data(), "readValueAsString",
                     Q_RETURN_ARG(QString, asStrings[i]), Q_ARG(int, i));
@@ -3072,20 +3101,56 @@ void tst_QmlCppCodegen::numbersInJsPrimitive()
     QCOMPARE(asStrings, convertToStrings(zeroes));
 
     QMetaObject::invokeMethod(o.data(), "writeValues");
-    for (int i = 0; i < 4; ++i) {
+    for (int i = 0; i < 8; ++i) {
         QMetaObject::invokeMethod(
                     o.data(), "readValueAsString",
                     Q_RETURN_ARG(QString, asStrings[i]), Q_ARG(int, i));
     }
     QCOMPARE(asStrings, convertToStrings(written));
 
+    QMetaObject::invokeMethod(o.data(), "negateValues");
+    for (int i = 0; i < 8; ++i) {
+        QMetaObject::invokeMethod(
+                    o.data(), "readValueAsString",
+                    Q_RETURN_ARG(QString, asStrings[i]), Q_ARG(int, i));
+    }
+    QCOMPARE(asStrings, convertToStrings(writtenNegative));
+
+    for (int i = 0; i < 8; ++i) {
+        QMetaObject::invokeMethod(o.data(), "shuffleValues");
+        for (int i = 0; i < 8; ++i) {
+            QMetaObject::invokeMethod(
+                        o.data(), "readValueAsString",
+                        Q_RETURN_ARG(QString, asStrings[i]), Q_ARG(int, i));
+        }
+        QCOMPARE(asStrings, convertToStrings(writtenShuffled[i]));
+    }
+
     QMetaObject::invokeMethod(o.data(), "storeValues");
-    for (int i = 0; i < 4; ++i) {
+    for (int i = 0; i < 8; ++i) {
         QMetaObject::invokeMethod(
                     o.data(), "readValueAsString",
                     Q_RETURN_ARG(QString, asStrings[i]), Q_ARG(int, i));
     }
     QCOMPARE(asStrings, convertToStrings(stored));
+
+    QMetaObject::invokeMethod(o.data(), "negateValues");
+    for (int i = 0; i < 8; ++i) {
+        QMetaObject::invokeMethod(
+                    o.data(), "readValueAsString",
+                    Q_RETURN_ARG(QString, asStrings[i]), Q_ARG(int, i));
+    }
+    QCOMPARE(asStrings, convertToStrings(storedNegative));
+
+    for (int i = 0; i < 8; ++i) {
+        QMetaObject::invokeMethod(o.data(), "shuffleValues");
+        for (int i = 0; i < 8; ++i) {
+            QMetaObject::invokeMethod(
+                        o.data(), "readValueAsString",
+                        Q_RETURN_ARG(QString, asStrings[i]), Q_ARG(int, i));
+        }
+        QCOMPARE(asStrings, convertToStrings(storedShuffled[i]));
+    }
 }
 
 void tst_QmlCppCodegen::infinitiesToInt()