Merged DMD commit feb54e8a6ad77b12eefd867e42ea1cf4fdf46341:

bugzilla 5145 Regression(2.050, 1.065) override error with forward ref of superclass
This commit is contained in:
David Nadlinger
2011-04-22 18:46:39 +02:00
parent df1c21bd4d
commit 4e0a896557

View File

@@ -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);