Merge branch 'master' into merge-2.061-2

This commit is contained in:
David Nadlinger
2013-01-12 01:27:02 +01:00
30 changed files with 134 additions and 43 deletions

View File

@@ -1645,7 +1645,7 @@ bool mustDefineSymbol(Dsymbol* s)
{
// we can't (and probably shouldn't?) define functions
// that weren't semantic3'ed
if (fd->semanticRun < 4)
if (fd->semanticRun < PASSsemantic3)
return false;
if (fd->isArrayOp == 1)
@@ -1669,7 +1669,7 @@ bool mustDefineSymbol(Dsymbol* s)
if ( !fd->isStaticCtorDeclaration()
&& !fd->isStaticDtorDeclaration()
&& !fd->isUnitTestDeclaration()
&& fd->canInline(true))
&& fd->canInline(true, false, false))
{
return true;
}