From 4e0a896557ee21ae2142c81062fe21e171f0ded9 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Fri, 22 Apr 2011 18:46:39 +0200 Subject: [PATCH] Merged DMD commit feb54e8a6ad77b12eefd867e42ea1cf4fdf46341: bugzilla 5145 Regression(2.050, 1.065) override error with forward ref of superclass --- dmd/func.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dmd/func.c b/dmd/func.c index 2af14d22..673ed395 100644 --- a/dmd/func.c +++ b/dmd/func.c @@ -1610,7 +1610,10 @@ Statement *FuncDeclaration::mergeFrequire(Statement *sf) if (fdv->fdrequire && fdv->fdrequire->semanticRun != PASSsemantic3done) { assert(fdv->scope); - fdv->semantic3(fdv->scope); + Scope *sc = fdv->scope->push(); + sc->stc &= ~STCoverride; + fdv->semantic3(sc); + sc->pop(); } sf = fdv->mergeFrequire(sf);