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

Merge pull request #190 from redstar/issue8675

Browse Source 
Fix Issue 8675 - Nothrow can't throw Errors
This commit is contained in:
Kai Nacke
2012-10-13 04:12:24 -07:00
parent 0777102e9d 9b80037f56
commit 9772270f60
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dmd2/statement.c
View File

@@ -5112,8 +5112,17 @@ Statement *ThrowStatement::semantic(Scope *sc)
int ThrowStatement::blockExit(bool mustNotThrow)
{
if (mustNotThrow)
error("%s is thrown but not caught", exp->type->toChars());
return BEthrow; // obviously
{
ClassDeclaration *cd = exp->type->toBasetype()->isClassHandle();
assert(cd);
// Bugzilla 8675
// Throwing Errors is allowed even if mustNotThrow
if (cd != ClassDeclaration::errorException &&
!ClassDeclaration::errorException->isBaseOf(cd, NULL))
error("%s is thrown but not caught", exp->type->toChars());
}
return BEthrow;
}