D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-21 15:23:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed consturctors of structs that have invariant

Browse Source
This commit is contained in:
Alexey Prokhin
2011-01-06 15:08:07 +03:00
parent 34987f71e2
commit f57409958c
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dmd2/func.c
View File

@@ -1615,9 +1615,17 @@ void FuncDeclaration::semantic3(Scope *sc)
if (type->nextOf()->ty != Tvoid)
{
#if IN_LLVM
Expression *e = 0;
if (isCtorDeclaration())
e = new VarExp(0, vthis);
else
e = new VarExp(0, vresult);
#else
// Create: return vresult;
assert(vresult);
Expression *e = new VarExp(0, vresult);
#endif
if (tintro)
{ e = e->implicitCastTo(sc, tintro->nextOf());
e = e->semantic(sc);

4
dmd2/statement.c
View File

@@ -3645,7 +3645,11 @@ Statement *ReturnStatement::semantic(Scope *sc)
if (exp)
{
#if IN_LLVM
if (!fd->isCtorDeclaration() && fd->returnLabel && tbret->ty != Tvoid)
#else
if (fd->returnLabel && tbret->ty != Tvoid)
#endif
{
assert(fd->vresult);
VarExp *v = new VarExp(0, fd->vresult);