From d523be301046ab6700bceb1c22794f34d5e7151f Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Sat, 13 Oct 2012 18:20:56 +0200 Subject: [PATCH] Added explanation for commit 9b80037. Such uncommented changes to the frontend are potentially a huge source of confusion during merging new frontend versions (especially if the piece of code gets changed again before the next upstream release). --- dmd2/statement.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dmd2/statement.c b/dmd2/statement.c index a408f762..a1831b32 100644 --- a/dmd2/statement.c +++ b/dmd2/statement.c @@ -5111,6 +5111,9 @@ Statement *ThrowStatement::semantic(Scope *sc) int ThrowStatement::blockExit(bool mustNotThrow) { +#if IN_LLVM + // Back-port of DMD commit d77b7c2b to allow usering Phobos from Git master + // for its many Win64 fixes. To be dropped during the 2.061 merge. if (mustNotThrow) { ClassDeclaration *cd = exp->type->toBasetype()->isClassHandle(); @@ -5123,6 +5126,11 @@ int ThrowStatement::blockExit(bool mustNotThrow) error("%s is thrown but not caught", exp->type->toChars()); } return BEthrow; +#else + if (mustNotThrow) + error("%s is thrown but not caught", exp->type->toChars()); + return BEthrow; // obviously +#endif }