D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-04-12 06:49:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tried using DtoDeclarationExp for VarDecls in Statements to fix nesting issues

Browse Source 
(see bug #104), but a separate helper that doesn't initialize would be nicer.
This commit is contained in:
Christian Kamm
2008-11-01 16:48:17 +01:00
parent ba754255d9
commit 5b17d36ce2
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gen/statements.cpp
View File

@@ -154,11 +154,7 @@ void IfStatement::toIR(IRState* p)
DtoDwarfStopPoint(loc.linnum);
if (match)
{
LLValue* allocainst = DtoAlloca(DtoType(match->type), "._tmp_if_var");
match->ir.irLocal = new IrLocal(match);
match->ir.irLocal->value = allocainst;
}
DtoDeclarationExp(match);
DValue* cond_e = condition->toElem(p);
LLValue* cond_val = cond_e->getRVal();
@@ -928,24 +924,23 @@ void ForeachStatement::toIR(IRState* p)
// key
const LLType* keytype = key ? DtoType(key->type) : DtoSize_t();
LLValue* keyvar = DtoAlloca(keytype, "foreachkey");
LLValue* keyvar;
if (key)
{
//key->llvmValue = keyvar;
assert(!key->ir.irLocal);
key->ir.irLocal = new IrLocal(key);
key->ir.irLocal->value = keyvar;
DtoDeclarationExp(key);
keyvar = key->ir.irLocal->value;
}
else
keyvar = DtoAlloca(keytype, "foreachkey");
LLValue* zerokey = llvm::ConstantInt::get(keytype,0,false);
// value
Logger::println("value = %s", value->toPrettyChars());
DtoDeclarationExp(value);
const LLType* valtype = DtoType(value->type);
LLValue* valvar = NULL;
if (!value->isRef() && !value->isOut())
valvar = DtoAlloca(valtype, "foreachval");
if (!value->ir.irLocal)
value->ir.irLocal = new IrLocal(value);
valvar = value->ir.irLocal->value;
// what to iterate
DValue* aggrval = aggr->toElem(p);
@@ -1155,6 +1150,7 @@ void WithStatement::toIR(IRState* p)
DValue* e = exp->toElem(p);
// DtoDeclarationExp(wthis); or preferably equivalent without initialization...
if (wthis->ir.isSet())
{
assert(wthis->nestedref);

21
ir/irlandingpad.cpp
View File

@@ -15,10 +15,23 @@ IRLandingPadInfo::IRLandingPadInfo(Catch* catchstmt, llvm::BasicBlock* end)
// assign storage to catch var
if(catchstmt->var) {
assert(!catchstmt->var->ir.irLocal);
catchstmt->var->ir.irLocal = new IrLocal(catchstmt->var);
LLValue* catch_var = gIR->func()->landingPad.getExceptionStorage();
catchstmt->var->ir.irLocal->value = gIR->ir->CreateBitCast(catch_var, getPtrToType(DtoType(catchstmt->var->type)));
// use the same storage for all exceptions that are not accessed in
// nested functions
if(!catchstmt->var->nestedref) {
assert(!catchstmt->var->ir.irLocal);
catchstmt->var->ir.irLocal = new IrLocal(catchstmt->var);
LLValue* catch_var = gIR->func()->landingPad.getExceptionStorage();
catchstmt->var->ir.irLocal->value = gIR->ir->CreateBitCast(catch_var, getPtrToType(DtoType(catchstmt->var->type)));
}
// this will alloca if we haven't already and take care of nested refs
DtoDeclarationExp(catchstmt->var);
// the exception will only be stored in catch_var. copy it over if necessary
if(catchstmt->var->ir.irLocal->value != gIR->func()->landingPad.getExceptionStorage()) {
LLValue* exc = gIR->ir->CreateBitCast(DtoLoad(gIR->func()->landingPad.getExceptionStorage()), DtoType(catchstmt->var->type));
DtoStore(exc, catchstmt->var->ir.irLocal->value);
}
}
// emit handler, if there is one