mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-06 10:57:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use 'undef' instead of null for unneeded contexts.

Browse source
This commit is contained in:
Frits van Bommel 2009-04-17 03:47:56 +02:00
parent 33eb3133f3
commit 0262a6ec8f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gen/nested.cpp
View file

@ -228,19 +228,25 @@ LLValue* DtoNestedContext(Loc loc, Dsymbol* sym)
{ {
ClassDeclaration* cd = irfunc->decl->isMember2()->isClassDeclaration(); ClassDeclaration* cd = irfunc->decl->isMember2()->isClassDeclaration();
if (!cd || !cd->vthis) if (!cd || !cd->vthis)
return getNullPtr(getVoidPtrType()); return llvm::UndefValue::get(getVoidPtrType());
val = DtoLoad(irfunc->thisArg); val = DtoLoad(irfunc->thisArg);
val = DtoLoad(DtoGEPi(val, 0,cd->vthis->ir.irField->index, ".vthis")); val = DtoLoad(DtoGEPi(val, 0,cd->vthis->ir.irField->index, ".vthis"));
} }
else else
{ {
return getNullPtr(getVoidPtrType()); return llvm::UndefValue::get(getVoidPtrType());
} }
if (nestedCtx == NCHybrid) { if (nestedCtx == NCHybrid) {
// If sym is a nested function, and it's parent context is different than the // If sym is a nested function, and it's parent context is different than the
// one we got, adjust it. // one we got, adjust it.
if (FuncDeclaration* fd = getParentFunc(sym->isFuncDeclaration(), true)) { if (FuncDeclaration* fd = getParentFunc(sym->isFuncDeclaration(), true)) {
// if this is for a function that doesn't access variables from
// enclosing scopes, it doesn't matter what we pass.
// Tell LLVM about it by passing an 'undef'.
if (fd->ir.irFunc->depth == 0)
return llvm::UndefValue::get(getVoidPtrType());
Logger::println("For nested function, parent is %s", fd->toChars()); Logger::println("For nested function, parent is %s", fd->toChars());
FuncDeclaration* ctxfd = irfunc->decl; FuncDeclaration* ctxfd = irfunc->decl;
Logger::println("Current function is %s", ctxfd->toChars()); Logger::println("Current function is %s", ctxfd->toChars());