D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-03-01 18:13:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor struct initializers codegen.

Browse Source 
This not only reduces code duplication, but the unification
also enables code a la StructLiteralExp to handle classes
(for CTFE class constant support in 2.063).
This commit is contained in:
David Nadlinger
2013-06-12 15:36:15 +02:00
parent 2cebe6408c
commit 9a016a1002
7 changed files with 280 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gen/toir.cpp
View File

@@ -2946,22 +2946,18 @@ LLConstant* StructLiteralExp::toConstElem(IRState* p)
// make sure the struct is resolved
sd->codegen(Type::sir);
// get inits
llvm::SmallVector<IrTypeStruct::VarInitConst, 16> varInits;
std::map<VarDeclaration*, llvm::Constant*> varInits;
size_t nexprs = elements->dim;
for (size_t i = 0; i < nexprs; i++)
{
if ((*elements)[i])
{
IrTypeStruct::VarInitConst v;
v.first = sd->fields[i];
v.second = (*elements)[i]->toConstElem(p);
varInits.push_back(v);
varInits[sd->fields[i]] = (*elements)[i]->toConstElem(p);
}
}
return sd->type->irtype->isStruct()->createInitializerConstant(varInits);
return sd->ir.irStruct->createInitializerConstant(varInits);
}
//////////////////////////////////////////////////////////////////////////////////////////