mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-12 13:55:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[svn r378] Make some errors fatal to prevent segfaults. Error instead of assert on missing label.

Browse source 
Fixes: nocompile/
finally_02, 03, 07, 08
goto_16_A, 16_B, 12, 13, 14
This commit is contained in:
Christian Kamm 2008-07-14 12:11:30 +02:00
parent bcc4cfdea4
commit b0b530ea42
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gen/llvmhelpers.cpp
View file

@ -161,7 +161,7 @@ LabelStatement* DtoLabelStatement(Identifier* ident)
FuncDeclaration::LabelMap::iterator iter = fd->labmap.find(ident->toChars()); FuncDeclaration::LabelMap::iterator iter = fd->labmap.find(ident->toChars());
if (iter == fd->labmap.end()) if (iter == fd->labmap.end())
{ {
if (fd->returnLabel->ident->equals(ident)) if (fd->returnLabel && fd->returnLabel->ident->equals(ident))
{ {
assert(fd->returnLabel->statement); assert(fd->returnLabel->statement);
return fd->returnLabel->statement; return fd->returnLabel->statement;
@ -180,11 +180,16 @@ void DtoGoto(Loc* loc, Identifier* target, EnclosingHandler* enclosinghandler, T
assert(!gIR->scopereturned()); assert(!gIR->scopereturned());
LabelStatement* lblstmt = DtoLabelStatement(target); LabelStatement* lblstmt = DtoLabelStatement(target);
assert(lblstmt != NULL); if(!lblstmt) {
error(*loc, "the label %s does not exist", target->toChars());
fatal();
}
// if the target label is inside inline asm, error // if the target label is inside inline asm, error
if(lblstmt->asmLabel) if(lblstmt->asmLabel) {
error(*loc, "cannot goto into inline asm block"); error(*loc, "cannot goto to label %s inside an inline asm block", target->toChars());
fatal();
}
// find target basic block // find target basic block
std::string labelname = gIR->func()->getScopedLabelName(target->toChars()); std::string labelname = gIR->func()->getScopedLabelName(target->toChars());
@ -204,8 +209,10 @@ void DtoGoto(Loc* loc, Identifier* target, EnclosingHandler* enclosinghandler, T
// goto into finally blocks is forbidden by the spec // goto into finally blocks is forbidden by the spec
// though it should not be problematic to implement // though it should not be problematic to implement
if(lblstmt->tf != sourcetf) if(lblstmt->tf != sourcetf) {
error(*loc, "spec disallows goto into finally block"); error(*loc, "spec disallows goto into finally block");
fatal();
}
// emit code for finallys between goto and label // emit code for finallys between goto and label
DtoEnclosingHandlers(enclosinghandler, endfinally); DtoEnclosingHandlers(enclosinghandler, endfinally);