Changeset 800:d14e4594c7d7

Timestamp:

11/29/08 12:28:17 (1 month ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>

branch:

default

Message:

Changed aggregate field initializers to be created lazily, fixes problem with static void arrays in aggregates.

Files:

• gen/classes.cpp (modified) (3 diffs)
• gen/structs.cpp (modified) (3 diffs)
• ir/irstruct.cpp (modified) (2 diffs)

gen/classes.cpp

@@ -425 +425 @@
-
-void addZeros(std::vector<llvm::Constant*>& inits, size_t pos, size_t offset); // irstruct.cpp
-
-//////////////////////////////////////////////////////////////////////////////
-
-// assigns constant initializers to fields introduced by cd
-static void init_field_inits(ClassDeclaration* cd)
-{
-    size_t n = cd->fields.dim;
-    for (size_t i=0; i<n; i++)
-    {
-        VarDeclaration* v = (VarDeclaration*)cd->fields.data[i];
-        IrField* f = v->ir.irField;
-        assert(!f->constInit);
-        f->constInit = DtoConstFieldInitializer(v->loc, v->type, v->init);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
@@ -503 +488 @@
-
-        // add the field
-
+
+
+
-        inits.push_back(var->ir.irField->constInit);
-
@@ -731 +718 @@
-    const llvm::ArrayType* vtbltype = isaArray(irstruct->vtblTy.get());
-    assert(vtbltype);
-
-    // make sure each field knows its default initializer
-    init_field_inits(cd);
-
-    // build initializer list

gen/structs.cpp

@@ -209 +209 @@
-                // do the default
-                Logger::println("adding default field: %s : +%u", nextdef->toChars(), nextdef->offset);
+                if (!nextdef->ir.irField->constInit)
+                    nextdef->ir.irField->constInit = DtoConstFieldInitializer(nextdef->loc, nextdef->type, nextdef->init);
-                LLConstant* c = nextdef->ir.irField->constInit;
-                inits.push_back(c);
@@ -262 +264 @@
-            // do the default
-            Logger::println("adding default field: %s : +%u", nextdef->toChars(), nextdef->offset);
+            if (!nextdef->ir.irField->constInit)
+                nextdef->ir.irField->constInit = DtoConstFieldInitializer(nextdef->loc, nextdef->type, nextdef->init);
-            LLConstant* c = nextdef->ir.irField->constInit;
-            inits.push_back(c);
@@ -464 +468 @@
-    const llvm::StructType* structtype = isaStruct(sd->type->ir.type->get());
-
-    // make sure each offset knows its default initializer
-    Array* fields = &sd->fields;
-    for (int k=0; k < fields->dim; k++)
-    {
-        VarDeclaration* v = (VarDeclaration*)fields->data[k];
-        LLConstant* finit = DtoConstFieldInitializer(v->loc, v->type, v->init);
-        v->ir.irField->constInit = finit;
-    }
-
-    // always generate the constant initalizer
-    if (sd->zeroInit)

ir/irstruct.cpp

@@ -10 +10 @@
-#include "gen/tollvm.h"
-#include "gen/logger.h"
+#include "gen/llvmhelpers.h"
-
-IrInterface::IrInterface(BaseClass* b)
@@ -319 +320 @@
-
-            // add the field
-
+
+
+
-            inits.push_back(var->ir.irField->constInit);
-