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

[svn r376] Fix bug with finally blocks and labels. The labels would get emitted multiple times and conflict.

Browse Source 
It is now possible to add label scopes in IrFunction and all labels names will be prefixed accordingly.

Also disallow goto into finally blocks.

Fixes nocompile/finally_02 and others.
This commit is contained in:
Christian Kamm
2008-07-14 11:48:55 +02:00
parent 65be990012
commit c1fbcd9942
5 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gen/llvmhelpers.cpp
View File

@@ -184,10 +184,10 @@ void DtoGoto(Loc* loc, Identifier* target, EnclosingHandler* enclosinghandler)
// if the target label is inside inline asm, error
if(lblstmt->asmLabel)
error("cannot goto into inline asm block", loc->toChars());
error(*loc, "cannot goto into inline asm block");
// find target basic block
std::string labelname = target->toChars();
std::string labelname = gIR->func()->getScopedLabelName(target->toChars());
llvm::BasicBlock*& targetBB = gIR->func()->labelToBB[labelname];
if (targetBB == NULL)
targetBB = llvm::BasicBlock::Create("label", gIR->topfunc());
@@ -200,7 +200,12 @@ void DtoGoto(Loc* loc, Identifier* target, EnclosingHandler* enclosinghandler)
// error if didn't find tf statement of label
if(endfinally != lblstmt->enclosinghandler)
error("cannot goto into try block", loc->toChars());
error(*loc, "cannot goto into try block");
// goto into finally blocks is forbidden by the spec
// though it should not be problematic to implement
if(lblstmt->tf)
error(*loc, "spec disallows goto into finally block");
// emit code for finallys between goto and label
DtoEnclosingHandlers(enclosinghandler, endfinally);
@@ -263,12 +268,20 @@ void DtoEnclosingHandlers(EnclosingHandler* start, EnclosingHandler* end)
}
assert(endfinally == end);
//
// emit code for finallys between start and end
//
// since the labelstatements possibly inside are private
// and might already exist push a label scope
gIR->func()->pushUniqueLabelScope("enclosing");
EnclosingHandler* tf = start;
while(tf != end) {
tf->emitCode(gIR);
tf = tf->getEnclosing();
}
gIR->func()->popLabelScope();
}
/****************************************************************************************/