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

fix Issue 8675 - Nothrow can't throw Errors

Browse Source 
- fixed by checking whether the thrown exception is derived
  from Error before complaining about uncaught throws
This commit is contained in:
kai
2012-10-09 06:43:20 +02:00
parent 0777102e9d
commit 9b80037f56
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;
}