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

Fixed problems with nested 'this'. Fixes #39 .

Browse Source 
Fixed problem with debug info order of intrinsic calls (func.start after declare).
This commit is contained in:
Tomas Lindquist Olsen
2008-08-02 00:50:39 +02:00
parent 3c5e28d6c7
commit e31070a437
5 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gen/toir.cpp
View File

@@ -969,6 +969,7 @@ DValue* ThisExp::toElem(IRState* p)
// this seems to happen for dmd generated assert statements like:
// assert(this, "null this");
// FIXME: check for TOKthis in AssertExp instead
if (!var)
{
LLValue* v = p->func()->thisVar;
@@ -978,9 +979,16 @@ DValue* ThisExp::toElem(IRState* p)
// regular this expr
else if (VarDeclaration* vd = var->isVarDeclaration()) {
LLValue* v;
v = p->func()->decl->ir.irFunc->thisVar;
if (llvm::isa<llvm::AllocaInst>(v))
v = DtoLoad(v);
if (vd->toParent2() != p->func()->decl) {
Logger::println("nested this exp");
v = DtoLoad(DtoNestedVariable(vd));
}
else {
Logger::println("normal this exp");
v = p->func()->decl->ir.irFunc->thisVar;
if (llvm::isa<llvm::AllocaInst>(v))
v = DtoLoad(v);
}
const LLType* t = DtoType(type);
if (v->getType() != t)
v = DtoBitCast(v, t);