1 files changed, 29 insertions, 23 deletions

diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h
index e169675f7d..dfa0d85dff 100644
--- a/src/qml/memory/qv4mm_p.h
+++ b/src/qml/memory/qv4mm_p.h
@@ -59,6 +59,10 @@
 
 //#define DETAILED_MM_STATS
 
+#define QV4_MM_MAXBLOCK_SHIFT "QV4_MM_MAXBLOCK_SHIFT"
+#define QV4_MM_MAX_CHUNK_SIZE "QV4_MM_MAX_CHUNK_SIZE"
+#define QV4_MM_STATS "QV4_MM_STATS"
+
 QT_BEGIN_NAMESPACE
 
 namespace QV4 {
@@ -104,8 +108,10 @@ public:
     template<typename ManagedType>
     inline typename ManagedType::Data *allocManaged(std::size_t size, std::size_t unmanagedSize = 0)
     {
+        V4_ASSERT_IS_TRIVIAL(typename ManagedType::Data)
         size = align(size);
         Heap::Base *o = allocData(size, unmanagedSize);
+        memset(o, 0, size);
         o->setVtable(ManagedType::staticVTable());
         return static_cast<typename ManagedType::Data *>(o);
     }
@@ -140,7 +146,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ManagedType> t(scope, allocManaged<ManagedType>(sizeof(typename ManagedType::Data), unmanagedSize));
-        (void)new (t->d()) typename ManagedType::Data(this, arg1);
+        t->d_unchecked()->init(this, arg1);
         return t->d();
     }
 
@@ -149,7 +155,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>(ic));
-        (void)new (t->d()) typename ObjectType::Data();
+        t->d_unchecked()->init();
         return t->d();
     }
 
@@ -158,8 +164,8 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>(ic));
-        t->d()->prototype = prototype->d();
-        (void)new (t->d()) typename ObjectType::Data();
+        t->d_unchecked()->prototype = prototype->d();
+        t->d_unchecked()->init();
         return t->d();
     }
 
@@ -168,8 +174,8 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>(ic));
-        t->d()->prototype = prototype->d();
-        (void)new (t->d()) typename ObjectType::Data(arg1);
+        t->d_unchecked()->prototype = prototype->d();
+        t->d_unchecked()->init(arg1);
         return t->d();
     }
 
@@ -178,8 +184,8 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>(ic));
-        t->d()->prototype = prototype->d();
-        (void)new (t->d()) typename ObjectType::Data(arg1, arg2);
+        t->d_unchecked()->prototype = prototype->d();
+        t->d_unchecked()->init(arg1, arg2);
         return t->d();
     }
 
@@ -188,8 +194,8 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>(ic));
-        t->d()->prototype = prototype->d();
-        (void)new (t->d()) typename ObjectType::Data(arg1, arg2, arg3);
+        t->d_unchecked()->prototype = prototype->d();
+        t->d_unchecked()->init(arg1, arg2, arg3);
         return t->d();
     }
 
@@ -198,8 +204,8 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>(ic));
-        t->d()->prototype = prototype->d();
-        (void)new (t->d()) typename ObjectType::Data(arg1, arg2, arg3, arg4);
+        t->d_unchecked()->prototype = prototype->d();
+        t->d_unchecked()->init(arg1, arg2, arg3, arg4);
         return t->d();
     }
 
@@ -208,7 +214,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>());
-        (void)new (t->d()) typename ObjectType::Data();
+        t->d_unchecked()->init();
         return t->d();
     }
 
@@ -217,7 +223,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>());
-        (void)new (t->d()) typename ObjectType::Data(arg1);
+        t->d_unchecked()->init(arg1);
         return t->d();
     }
 
@@ -226,7 +232,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>());
-        (void)new (t->d()) typename ObjectType::Data(arg1, arg2);
+        t->d_unchecked()->init(arg1, arg2);
         return t->d();
     }
 
@@ -235,7 +241,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>());
-        (void)new (t->d()) typename ObjectType::Data(arg1, arg2, arg3);
+        t->d_unchecked()->init(arg1, arg2, arg3);
         return t->d();
     }
 
@@ -244,7 +250,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ObjectType> t(scope, allocateObject<ObjectType>());
-        (void)new (t->d()) typename ObjectType::Data(arg1, arg2, arg3, arg4);
+        t->d_unchecked()->init(arg1, arg2, arg3, arg4);
         return t->d();
     }
 
@@ -254,7 +260,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ManagedType> t(scope, allocManaged<ManagedType>(sizeof(typename ManagedType::Data)));
-        (void)new (t->d()) typename ManagedType::Data();
+        t->d_unchecked()->init();
         return t->d();
     }
 
@@ -263,7 +269,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ManagedType> t(scope, allocManaged<ManagedType>(sizeof(typename ManagedType::Data)));
-        (void)new (t->d()) typename ManagedType::Data(arg1);
+        t->d_unchecked()->init(arg1);
         return t->d();
     }
 
@@ -272,7 +278,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ManagedType> t(scope, allocManaged<ManagedType>(sizeof(typename ManagedType::Data)));
-        (void)new (t->d()) typename ManagedType::Data(arg1, arg2);
+        t->d_unchecked()->init(arg1, arg2);
         return t->d();
     }
 
@@ -281,7 +287,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ManagedType> t(scope, allocManaged<ManagedType>(sizeof(typename ManagedType::Data)));
-        (void)new (t->d()) typename ManagedType::Data(arg1, arg2, arg3);
+        t->d_unchecked()->init(arg1, arg2, arg3);
         return t->d();
     }
 
@@ -290,7 +296,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ManagedType> t(scope, allocManaged<ManagedType>(sizeof(typename ManagedType::Data)));
-        (void)new (t->d()) typename ManagedType::Data(arg1, arg2, arg3, arg4);
+        t->d_unchecked()->init(arg1, arg2, arg3, arg4);
         return t->d();
     }
 
@@ -299,7 +305,7 @@ public:
     {
         Scope scope(engine);
         Scoped<ManagedType> t(scope, allocManaged<ManagedType>(sizeof(typename ManagedType::Data)));
-        (void)new (t->d()) typename ManagedType::Data(arg1, arg2, arg3, arg4, arg5);
+        t->d_unchecked()->init(arg1, arg2, arg3, arg4, arg5);
         return t->d();
     }