3 files changed, 23 insertions, 44 deletions

diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 673bc2c481..7f2cf40611 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -82,12 +82,11 @@ struct PoolList
     PoolList()
         : first(nullptr)
         , last(nullptr)
-        , count(0)
     {}
 
     T *first;
     T *last;
-    int count;
+    int count = 0;
 
     int append(T *item) {
         item->next = nullptr;
@@ -205,11 +204,11 @@ class FixedPoolArray
 {
     T *data;
 public:
-    int count;
+    int count = 0;
 
     FixedPoolArray()
         : data(nullptr)
-        , count(0)
+
     {}
 
     void allocate(QQmlJS::MemoryPool *pool, int size)
@@ -343,21 +342,16 @@ struct Function
 struct Q_QML_PRIVATE_EXPORT CompiledFunctionOrExpression
 {
     CompiledFunctionOrExpression()
-        : node(nullptr)
-        , nameIndex(0)
-        , disableAcceleratedLookups(false)
-        , next(nullptr)
+
     {}
     CompiledFunctionOrExpression(QQmlJS::AST::Node *n)
         : node(n)
-        , nameIndex(0)
-        , disableAcceleratedLookups(false)
-        , next(nullptr)
+
     {}
-    QQmlJS::AST::Node *node; // FunctionDeclaration, Statement or Expression
-    quint32 nameIndex;
-    bool disableAcceleratedLookups;
-    CompiledFunctionOrExpression *next;
+    QQmlJS::AST::Node *node = nullptr; // FunctionDeclaration, Statement or Expression
+    quint32 nameIndex = 0;
+    bool disableAcceleratedLookups = false;
+    CompiledFunctionOrExpression *next = nullptr;
 };
 
 struct Q_QML_PRIVATE_EXPORT Object
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 27c8e96e16..a46d47cb67 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -191,10 +191,7 @@ public:
         bool isLValue() const { return !isReadonly; }
 
         Reference(Codegen *cg, Type type = Invalid) : type(type), codegen(cg) {}
-        Reference()
-            : type(Invalid)
-            , codegen(nullptr)
-        {}
+        Reference() {}
         Reference(const Reference &other);
 
         Reference &operator =(const Reference &other);
@@ -367,7 +364,7 @@ public:
         bool stackSlotIsLocalOrArgument = false;
         bool isVolatile = false;
         bool global = false;
-        Codegen *codegen;
+        Codegen *codegen = nullptr;
 
     private:
         void storeAccumulator() const;
@@ -386,16 +383,12 @@ public:
     };
 
     struct ObjectPropertyValue {
-        ObjectPropertyValue()
-            : getter(-1)
-            , setter(-1)
-            , keyAsIndex(UINT_MAX)
-        {}
+        ObjectPropertyValue() {}
 
         Reference rvalue;
-        int getter; // index in _module->functions or -1 if not set
-        int setter;
-        uint keyAsIndex;
+        int getter = -1; // index in _module->functions or -1 if not set
+        int setter = -1;
+        uint keyAsIndex = UINT_MAX;
 
         bool hasGetter() const { return getter >= 0; }
         bool hasSetter() const { return setter >= 0; }
@@ -406,34 +399,26 @@ protected:
     class Result {
         Reference _result;
 
-        const BytecodeGenerator::Label *_iftrue;
-        const BytecodeGenerator::Label *_iffalse;
-        Format _format;
+        const BytecodeGenerator::Label *_iftrue = nullptr;
+        const BytecodeGenerator::Label *_iffalse = nullptr;
+        Format _format = ex;
         Format _requested;
         bool _trueBlockFollowsCondition = false;
 
     public:
         explicit Result(const Reference &lrvalue)
             : _result(lrvalue)
-            , _iftrue(nullptr)
-            , _iffalse(nullptr)
-            , _format(ex)
             , _requested(ex)
-        {
-        }
+        {}
 
         explicit Result(Format requested = ex)
-            : _iftrue(nullptr)
-            , _iffalse(nullptr)
-            , _format(ex)
-            , _requested(requested) {}
+            : _requested(requested) {}
 
         explicit Result(const BytecodeGenerator::Label *iftrue,
                         const BytecodeGenerator::Label *iffalse,
                         bool trueBlockFollowsCondition)
             : _iftrue(iftrue)
             , _iffalse(iffalse)
-            , _format(ex)
             , _requested(cx)
             , _trueBlockFollowsCondition(trueBlockFollowsCondition)
         {
diff --git a/src/qml/compiler/qv4compilercontext_p.h b/src/qml/compiler/qv4compilercontext_p.h
index d375942d0e..a78a66db52 100644
--- a/src/qml/compiler/qv4compilercontext_p.h
+++ b/src/qml/compiler/qv4compilercontext_p.h
@@ -173,10 +173,10 @@ struct Context {
     // Map from meta property index (existence implies dependency) to notify signal index
     struct KeyValuePair
     {
-        quint32 _key;
-        quint32 _value;
+        quint32 _key = 0;
+        quint32 _value = 0;
 
-        KeyValuePair(): _key(0), _value(0) {}
+        KeyValuePair() {}
         KeyValuePair(quint32 key, quint32 value): _key(key), _value(value) {}
 
         quint32 key() const { return _key; }