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

Codegen the try block before the catches and finally

Browse Source
This commit is contained in:
Alexey Prokhin
2012-04-06 15:51:12 +04:00
parent 27fadea1b9
commit 2f60c4dcda
3 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gen/statements.cpp
View File

@@ -678,7 +678,6 @@ void TryFinallyStatement::toIR(IRState* p)
pad.addFinally(finalbody);
pad.push(landingpadbb);
gIR->func()->gen->targetScopes.push_back(IRTargetScope(this,new EnclosingTryFinally(this,gIR->func()->gen->landingPad),NULL,NULL));
gIR->func()->gen->landingPad = pad.get();
//
// do the try block
@@ -695,7 +694,6 @@ void TryFinallyStatement::toIR(IRState* p)
llvm::BranchInst::Create(finallybb, p->scopebb());
pad.pop();
gIR->func()->gen->landingPad = pad.get();
gIR->func()->gen->targetScopes.pop_back();
//
@@ -739,7 +737,7 @@ void TryCatchStatement::toIR(IRState* p)
llvm::BranchInst::Create(trybb, p->scopebb());
//
// do catches and the landing pad
// set up the landing pad
//
assert(catches);
gIR->scope() = IRScope(landingpadbb, endbb);
@@ -752,7 +750,6 @@ void TryCatchStatement::toIR(IRState* p)
}
pad.push(landingpadbb);
gIR->func()->gen->landingPad = pad.get();
//
// do the try block
@@ -768,7 +765,6 @@ void TryCatchStatement::toIR(IRState* p)
llvm::BranchInst::Create(endbb, p->scopebb());
pad.pop();
gIR->func()->gen->landingPad = pad.get();
// rewrite the scope
p->scope() = IRScope(endbb,oldend);