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

Fix #163.

Browse Source
This commit is contained in:
Christian Kamm
2009-01-17 14:53:32 +01:00
parent 4433460171
commit 9081e55746
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gen/toir.cpp
View File

@@ -2099,9 +2099,15 @@ DValue* CondExp::toElem(IRState* p)
Type* dtype = type->toBasetype();
const LLType* resty = DtoType(dtype);
// allocate a temporary for the final result. failed to come up with a better way :/
LLValue* resval = DtoAlloca(resty,"condtmp");
DVarValue* dvv = new DVarValue(type, resval);
DValue* dvv;
// voids returns will need no storage
if (dtype->ty != Tvoid) {
// allocate a temporary for the final result. failed to come up with a better way :/
LLValue* resval = DtoAlloca(resty,"condtmp");
dvv = new DVarValue(type, resval);
} else {
dvv = new DConstValue(type, getNullValue(DtoTypeNotVoid(dtype)));
}
llvm::BasicBlock* oldend = p->scopeend();
llvm::BasicBlock* condtrue = llvm::BasicBlock::Create("condtrue", gIR->topfunc(), oldend);
@@ -2114,12 +2120,14 @@ DValue* CondExp::toElem(IRState* p)
p->scope() = IRScope(condtrue, condfalse);
DValue* u = e1->toElem(p);
DtoAssign(loc, dvv, u);
if (dtype->ty != Tvoid)
DtoAssign(loc, dvv, u);
llvm::BranchInst::Create(condend,p->scopebb());
p->scope() = IRScope(condfalse, condend);
DValue* v = e2->toElem(p);
DtoAssign(loc, dvv, v);
if (dtype->ty != Tvoid)
DtoAssign(loc, dvv, v);
llvm::BranchInst::Create(condend,p->scopebb());
p->scope() = IRScope(condend, oldend);

18
tests/mini/bug163_void_condexp.d Normal file
View File

@@ -0,0 +1,18 @@
static foocalled = false;
static barcalled = false;
void foo() { foocalled = true; }
void bar() { barcalled = true; }
void f(bool b)
{
return b ? foo() : bar();
}
void main()
{
f(true);
assert(foocalled && !barcalled);
f(false);
assert(foocalled && barcalled);
}