Changeset 801:c8d9b30a0dc2

Timestamp:

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

Author:

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

Parents:

800:d14e4594c7d7 799:9f92b6e40fd3

branch:

default

Message:

merge

Files:

• gen/classes.cpp (modified) (3 diffs)
• gen/classes.cpp (modified) (1 diff)

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/classes.cpp

@@ -548 +548 @@
-        assert(fd);
-
-
+ || (cd->isAbstract() && !fd->fbody)
-        {
-            sinits[k] = getNullPtr(getVoidPtrType());