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

Wrong break target choosen for labeled break.

Browse Source 
This fixes a test failure in runnable/foreach5.d.
This commit is contained in:
Kai Nacke
2013-11-20 17:00:37 +01:00
parent b22b7aef3c
commit 3ef3e358f5
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gen/statements.cpp
View File

@@ -535,18 +535,25 @@ void BreakStatement::toIR(IRState* p)
targetLoopStatement = tmp->statement;
// find the right break block and jump there
// the right break block is found in the nearest scope to the LabelStatement
// with onlyLabelBreak == true. Therefore the search starts at the outer
// scope (in contract to most other searches, which start with the inner
// scope). This code is tested by test runnable/foreach5.d, test9068().
bool found = false;
FuncGen::TargetScopeVec::reverse_iterator it = p->func()->gen->targetScopes.rbegin();
FuncGen::TargetScopeVec::reverse_iterator it_end = p->func()->gen->targetScopes.rend();
while(it != it_end) {
if(it->s == targetLoopStatement) {
FuncGen::TargetScopeVec::iterator it = p->func()->gen->targetScopes.begin();
FuncGen::TargetScopeVec::iterator it_end = p->func()->gen->targetScopes.end();
while (it != it_end && it->s != target)
++it;
assert(it != it_end && "Labeled break but no label found");
while (it != it_end) {
if (it->onlyLabeledBreak || it->s == targetLoopStatement) {
llvm::BranchInst::Create(it->breakTarget, p->scopebb());
found = true;
break;
}
++it;
}
assert(found);
assert(found && "Labeled break but no jump target found");
}
else {
// find closest scope with a break target