D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-11 18:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CTFE: fixed calling of invariant from a constructor

Browse Source
This commit is contained in:
Alexey Prokhin
2011-07-22 22:22:06 +04:00
parent ed84a21462
commit 213524bc61
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dmd2/func.c
View File

@@ -1670,10 +1670,14 @@ void FuncDeclaration::semantic3(Scope *sc)
{
#if IN_LLVM
Expression *e = 0;
if (isCtorDeclaration())
e = new VarExp(0, vthis);
else
if (isCtorDeclaration()) {
ThisExp *te = new ThisExp(0);
te->type = vthis->type;
te->var = vthis;
e = te;
} else {
e = new VarExp(0, vresult);
}
#else
// Create: return vresult;
assert(vresult);

8
dmd2/statement.c
View File

@@ -3686,7 +3686,11 @@ Statement *ReturnStatement::semantic(Scope *sc)
else
{
// Construct: return vresult;
#if IN_LLVM
if (!fd->vresult && !fd->isCtorDeclaration())
#else
if (!fd->vresult)
#endif
{ // Declare vresult
VarDeclaration *v = new VarDeclaration(loc, tret, Id::result, NULL);
v->noscope = 1;
@@ -3698,7 +3702,11 @@ Statement *ReturnStatement::semantic(Scope *sc)
fd->vresult = v;
}
#if IN_LLVM
s = new ReturnStatement(0, new VarExp(0, fd->isCtorDeclaration() ? fd->vthis : fd->vresult));
#else
s = new ReturnStatement(0, new VarExp(0, fd->vresult));
#endif
sc->fes->cases->push(s);
// Construct: { vresult = exp; return cases->dim + 1; }