D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-05-04 09:21:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/llvm3.0'

Browse Source
This commit is contained in:
David Nadlinger
2011-11-12 19:47:56 +01:00
parent dc46ae547c 7431d58702
commit ffe37c4a62
78 changed files with 1391 additions and 1049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dmd2/func.c
View File

@@ -1648,29 +1648,13 @@ void FuncDeclaration::semantic3(Scope *sc)
#if STRUCTTHISREF
if (ad->isStructDeclaration())
v = v->addressOf(sc);
#endif
#if IN_LLVM
//e = new AssertExp(loc, v, NULL);
// LDC: check for null this
//v = new ThisExp(0);
//v->type = vthis->type;
//v->var = vthis; // Error: Expression has no property var... in D1 typeof(v) == ThisExp
//NullExp *nv = new NullExp(0);
//nv->type = v->type;
//IdentityExp *ie = new IdentityExp(TOKnotidentity, 0, v, nv);
//ie->type = Type::tbool;
#endif
Expression *se = new StringExp(0, (char *)"null this");
se = se->semantic(sc);
#if !IN_LLVM
se->type = Type::tchar->arrayOf();
//#if IN_LLVM
// ee = new AssertExp(loc, ie, se);
//#else
#endif
e = new AssertExp(loc, v, se);
//#endif
}
if (ee)
{