Changeset 812:6c2ff06c4201

Timestamp:

11/30/08 22:37:54 (1 month ago)

Author:

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

branch:

default

Message:

Fixed a nasty bug with how interface vtables for class initializers were output, causing some class fields to be skipped.
Fixed a problem in definition of ClassInfos? where an invalid constant was potentially used. This needs to be looked into proper as it might happen again in the future.

Files:

• gen/classes.cpp (modified) (7 diffs)
• gen/llvmhelpers.cpp (modified) (1 diff)
• gen/structs.cpp (modified) (1 diff)

gen/classes.cpp

@@ -436 +436 @@
-    }
-
-", cd->toChars(), target->toChars()
+ starting at %lu", cd->toChars(), target->toChars(), offsetbegin
-    LOG_SCOPE;
-
@@ -465 +465 @@
-        else
-        {
-", var->toChars()
+ at offset %u, current pos is %lu", var->toChars(), var->offset, lastoffset+lastsize
-        }
-    }
@@ -520 +520 @@
-            inits.push_back(getNullPtr(getVoidPtrType()));
-
-PTRSIZE
+lastsize
-        lastsize = PTRSIZE;
-    }
@@ -750 +750 @@
-
-    // build constant from inits
+    assert(!irstruct->constInit);
-    irstruct->constInit = LLConstantStruct::get(inits); // classes are never packed
-
@@ -1438 +1439 @@
-
-    TypeClass* cdty = (TypeClass*)cd->type;
- && !cd->isAbstract()
+
-    {
-        assert(ir->init);
@@ -1451 +1452 @@
-    ClassDeclaration* cinfo = ClassDeclaration::classinfo;
-    DtoForceConstInitDsymbol(cinfo);
-    assert(cinfo->ir.irStruct->constInit);
-
-    LLConstant* c;
@@ -1474 +1474 @@
-        c = DtoBitCast(ir->init, voidPtr);
-        //Logger::cout() << *ir->constInit->getType() << std::endl;
-constInit->getType(
+init->getType()->getContainedType(0
-        c = DtoConstSlice(DtoConstSize_t(initsz), c);
-    }

gen/llvmhelpers.cpp

@@ -1006 +1006 @@
-    llvm::cast<LLOpaqueType>(glob->type.get())->refineAbstractTypeTo(initVal->getType());
-
+    assert(!glob->constInit);
-    glob->constInit = initVal;
-

gen/structs.cpp

@@ -468 +468 @@
-
-    // always generate the constant initalizer
+    assert(!irstruct->constInit);
-    if (sd->zeroInit)
-    {