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

[svn r284] Fixed some problems with cases, code is not as pretty, but it doesn't crash llvm!

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2008-06-14 06:13:35 +02:00
parent de89b4bc6f
commit d85267ef5a
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gen/statements.cpp
View File

@@ -651,6 +651,14 @@ void SwitchStatement::toIR(IRState* p)
llvm::BasicBlock* oldend = gIR->scopeend();
// clear data from previous passes... :/
for (int i=0; i<cases->dim; ++i)
{
CaseStatement* cs = (CaseStatement*)cases->data[i];
cs->bodyBB = NULL;
cs->llvmIdx = NULL;
}
// string switch?
llvm::GlobalVariable* switchTable = 0;
Array caseArray;
@@ -752,17 +760,15 @@ void CaseStatement::toIR(IRState* p)
Logger::println("CaseStatement::toIR(): %s", loc.toChars());
LOG_SCOPE;
if (!bodyBB)
llvm::BasicBlock* nbb = llvm::BasicBlock::Create("case", p->topfunc(), p->scopeend());
if (bodyBB && !bodyBB->getTerminator())
{
bodyBB = llvm::BasicBlock::Create("case", p->topfunc(), p->scopeend());
}
else
{
bodyBB->moveAfter(p->scopebb());
llvm::BranchInst::Create(nbb, bodyBB);
}
bodyBB = nbb;
if (exp->type->isintegral()) {
assert(!llvmIdx);
LLConstant* c = exp->toConstElem(p);
llvmIdx = isaConstantInt(c);
}
@@ -787,7 +793,13 @@ void DefaultStatement::toIR(IRState* p)
assert(bodyBB);
bodyBB->moveAfter(p->scopebb());
llvm::BasicBlock* nbb = llvm::BasicBlock::Create("default", p->topfunc(), p->scopeend());
if (!bodyBB->getTerminator())
{
llvm::BranchInst::Create(nbb, bodyBB);
}
bodyBB = nbb;
if (!p->scopereturned())
llvm::BranchInst::Create(bodyBB, p->scopebb());
@@ -1088,7 +1100,7 @@ void GotoCaseStatement::toIR(IRState* p)
assert(!p->scopereturned());
if (!cs->bodyBB)
{
cs->bodyBB = llvm::BasicBlock::Create("case", p->topfunc(), p->scopeend());
cs->bodyBB = llvm::BasicBlock::Create("goto_case", p->topfunc(), p->scopeend());
}
emit_finallyblocks(p, enclosingtryfinally, sw->enclosingtryfinally);