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

Moved IRTargetScopeS from IRState into IrFunction, fixes #240 .

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2009-03-26 18:46:21 +01:00
parent 91698fd0a5
commit 367b8da8f4
4 changed files with 71 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gen/llvmhelpers.cpp
View File

@@ -248,14 +248,16 @@ void DtoEnclosingHandlers(Loc loc, Statement* target)
target = lblstmt->enclosingScopeExit;
// figure out up until what handler we need to emit
IRState::TargetScopeVec::reverse_iterator targetit;
for (targetit = gIR->targetScopes.rbegin(); targetit != gIR->targetScopes.rend(); ++targetit) {
IrFunction::TargetScopeVec::reverse_iterator targetit = gIR->func()->targetScopes.rbegin();
IrFunction::TargetScopeVec::reverse_iterator it_end = gIR->func()->targetScopes.rend();
while(targetit != it_end) {
if (targetit->s == target) {
break;
}
++targetit;
}
if (target && targetit == gIR->targetScopes.rend()) {
if (target && targetit == it_end) {
if (lblstmt)
error(loc, "cannot goto into try, volatile or synchronized statement at %s", target->loc.toChars());
else
@@ -270,10 +272,11 @@ void DtoEnclosingHandlers(Loc loc, Statement* target)
// since the labelstatements possibly inside are private
// and might already exist push a label scope
gIR->func()->pushUniqueLabelScope("enclosing");
IRState::TargetScopeVec::reverse_iterator it;
for (it = gIR->targetScopes.rbegin(); it != targetit; ++it) {
IrFunction::TargetScopeVec::reverse_iterator it = gIR->func()->targetScopes.rbegin();
while (it != targetit) {
if (it->enclosinghandler)
it->enclosinghandler->emitCode(gIR);
++it;
}
gIR->func()->popLabelScope();
}