Create proper template objects for tagged templates

If a tagged template gets evaluated multiple times, the
underlying template object is shared.

Change-Id: Ie2f476fbc93d5991322ce1087c42719a8d8333ae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 41 insertions, 1 deletions

diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index b36b1a91ea..d0785c6883 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -373,6 +373,34 @@ struct Class
 };
 static_assert(sizeof(Class) == 24, "Class structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
+struct TemplateObject
+{
+    quint32_le size;
+
+    static int calculateSize(int size) {
+        int trailingData = 2 * size * sizeof(quint32_le);
+        size_t s = align(sizeof(TemplateObject) + trailingData);
+        Q_ASSERT(s < INT_MAX);
+        return int(s);
+    }
+
+    static size_t align(size_t a) {
+        return (a + 7) & ~size_t(7);
+    }
+
+    const quint32_le *stringTable() const {
+        return reinterpret_cast<const quint32_le *>(reinterpret_cast<const char *>(this + 1));
+    }
+
+    uint stringIndexAt(uint i) const {
+        return stringTable()[i];
+    }
+    uint rawStringIndexAt(uint i) const {
+        return stringTable()[size + i];
+    }
+};
+static_assert(sizeof(TemplateObject) == 4, "Template object structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
+
 struct ExportEntry
 {
     quint32_le exportName;
@@ -841,6 +869,8 @@ struct Unit
     quint32_le offsetToFunctionTable;
     quint32_le classTableSize;
     quint32_le offsetToClassTable;
+    quint32_le templateObjectTableSize;
+    quint32_le offsetToTemplateObjectTable;
     quint32_le blockTableSize;
     quint32_le offsetToBlockTable;
     quint32_le lookupTableSize;
@@ -908,6 +938,7 @@ struct Unit
 
     const quint32_le *functionOffsetTable() const { return reinterpret_cast<const quint32_le*>((reinterpret_cast<const char *>(this)) + offsetToFunctionTable); }
     const quint32_le *classOffsetTable() const { return reinterpret_cast<const quint32_le*>((reinterpret_cast<const char *>(this)) + offsetToClassTable); }
+    const quint32_le *templateObjectOffsetTable() const { return reinterpret_cast<const quint32_le*>((reinterpret_cast<const char *>(this)) + offsetToTemplateObjectTable); }
     const quint32_le *blockOffsetTable() const { return reinterpret_cast<const quint32_le*>((reinterpret_cast<const char *>(this)) + offsetToBlockTable); }
 
     const Function *functionAt(int idx) const {
@@ -922,6 +953,12 @@ struct Unit
         return reinterpret_cast<const Class *>(reinterpret_cast<const char *>(this) + offset);
     }
 
+    const TemplateObject *templateObjectAt(int idx) const {
+        const quint32_le *offsetTable = templateObjectOffsetTable();
+        const quint32_le offset = offsetTable[idx];
+        return reinterpret_cast<const TemplateObject *>(reinterpret_cast<const char *>(this) + offset);
+    }
+
     const Block *blockAt(int idx) const {
         const quint32_le *offsetTable = blockOffsetTable();
         const quint32_le offset = offsetTable[idx];
@@ -957,7 +994,7 @@ struct Unit
     const quint32_le *moduleRequestTable() const { return reinterpret_cast<const quint32_le*>((reinterpret_cast<const char *>(this)) + offsetToModuleRequestTable); }
 };
 
-static_assert(sizeof(Unit) == 240, "Unit structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
+static_assert(sizeof(Unit) == 248, "Unit structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct TypeReference
 {
@@ -1110,6 +1147,7 @@ public:
     QV4::Lookup *runtimeLookups = nullptr;
     QVector<QV4::Function *> runtimeFunctions;
     QVector<QV4::Heap::InternalClass *> runtimeBlocks;
+    mutable QVector<QV4::Heap::Object *> templateObjects;
     mutable QQmlNullableValue<QUrl> m_url;
     mutable QQmlNullableValue<QUrl> m_finalUrl;
 
@@ -1160,6 +1198,8 @@ public:
         return data->stringAtInternal(index);
     }
 
+    Heap::Object *templateObjectAt(int index) const;
+
     struct FunctionIterator
     {
         FunctionIterator(const Unit *unit, const Object *object, int index) : unit(unit), object(object), index(index) {}