Changeset 803:c62c6936635b

Timestamp:

11/29/08 15:26:50 (1 month ago)

Author:

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

branch:

default

Message:

Removed DtoConstFieldInitializer?, it's no longer needed and was buggy.

Files:

• gen/classes.cpp (modified) (1 diff)
• gen/llvmhelpers.cpp (modified) (2 diffs)
• gen/llvmhelpers.h (modified) (1 diff)
• gen/structs.cpp (modified) (2 diffs)
• ir/irstruct.cpp (modified) (1 diff)

gen/classes.cpp

@@ -486 +486 @@
-        // and build its constant initializer lazily
-        if (!var->ir.irField->constInit)
-Field
+
-        inits.push_back(var->ir.irField->constInit);
-

gen/llvmhelpers.cpp

@@ -1429 +1429 @@
-//////////////////////////////////////////////////////////////////////////////////////////
-
-LLConstant* DtoConstFieldInitializer(Loc loc, Type* t, Initializer* init)
-{
-    Logger::println("DtoConstFieldInitializer");
-    LOG_SCOPE;
-
-    const LLType* _type = DtoType(t);
-
-    LLConstant* _init = DtoConstInitializer(loc, t, init);
-    assert(_init);
-    if (_type != _init->getType())
-    {
-        if (Logger::enabled())
-            Logger::cout() << "field init is: " << *_init << " type should be " << *_type << '\n';
-        if (t->ty == Tsarray)
-        {
-            const LLArrayType* arrty = isaArray(_type);
-            uint64_t n = arrty->getNumElements();
-            std::vector<LLConstant*> vals(n,_init);
-            _init = llvm::ConstantArray::get(arrty, vals);
-        }
-        else if (t->ty == Tarray)
-        {
-            assert(isaStruct(_type));
-            _init = llvm::ConstantAggregateZero::get(_type);
-        }
-        else if (t->ty == Tstruct)
-        {
-            const LLStructType* structty = isaStruct(_type);
-            TypeStruct* ts = (TypeStruct*)t;
-            assert(ts);
-            assert(ts->sym);
-            assert(ts->sym->ir.irStruct->constInit);
-            _init = ts->sym->ir.irStruct->constInit;
-        }
-        else if (t->ty == Tclass)
-        {
-            _init = llvm::Constant::getNullValue(_type);
-        }
-        else {
-            Logger::println("failed for type %s", t->toChars());
-            assert(0);
-        }
-    }
-
-    return _init;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-DValue* DtoInitializer(LLValue* target, Initializer* init)
-{
@@ -1538 +1489 @@
-
-    LLSmallVector<size_t, 4> dims;
-
-    // handle zero initializers
-    if (expbase->isintegral() && exp->isConst())
-    {
-        if (!exp->toInteger())
-            return LLConstant::getNullValue(dstTy);
-    }
-    else if (exp->op == TOKnull)
-    {
-        return LLConstant::getNullValue(dstTy);
-    }
-
-    while(1)

gen/llvmhelpers.h

@@ -88 +88 @@
-// initializer helpers
-LLConstant* DtoConstInitializer(Loc loc, Type* type, Initializer* init);
-LLConstant* DtoConstFieldInitializer(Loc loc, Type* type, Initializer* init);
-LLConstant* DtoConstExpInit(Loc loc, Type* t, Expression* exp);
-DValue* DtoInitializer(LLValue* target, Initializer* init);

gen/structs.cpp

@@ -209 +209 @@
-                Logger::println("adding default field: %s : +%u", nextdef->toChars(), nextdef->offset);
-                if (!nextdef->ir.irField->constInit)
-Field
+
-                LLConstant* c = nextdef->ir.irField->constInit;
-                inits.push_back(c);
@@ -264 +264 @@
-            Logger::println("adding default field: %s : +%u", nextdef->toChars(), nextdef->offset);
-            if (!nextdef->ir.irField->constInit)
-Field
+
-            LLConstant* c = nextdef->ir.irField->constInit;
-            inits.push_back(c);

ir/irstruct.cpp

@@ -320 +320 @@
-            // lazily default initialize
-            if (!var->ir.irField->constInit)
-Field
+
-            inits.push_back(var->ir.irField->constInit);
-