Merge branch 'master' into merge-2.061-2.

This commit is contained in:
David Nadlinger 2013-01-12 14:31:54 +01:00
commit 7974c33c61

View file

@ -1669,7 +1669,10 @@ bool mustDefineSymbol(Dsymbol* s)
if ( !fd->isStaticCtorDeclaration() if ( !fd->isStaticCtorDeclaration()
&& !fd->isStaticDtorDeclaration() && !fd->isStaticDtorDeclaration()
&& !fd->isUnitTestDeclaration() && !fd->isUnitTestDeclaration()
&& fd->canInline(true, false, false)) // FIXME: Should be canInline(true, false, false), but this
// causes a misoptimization in druntime on x86, likely due to
// an LLVM bug.
&& fd->canInline(true))
{ {
return true; return true;
} }