# HG changeset patch # User Christian Kamm # Date 1238698599 -7200 # Node ID c0091f3b72f16d00f5df3653491c6f943f03d927 # Parent 442ab244c4552ccf90b54c8ba1cb9d7291d80a97 Make sure debug info is only declared once per alloca. diff -r 442ab244c455 -r c0091f3b72f1 gen/llvmhelpers.cpp --- a/gen/llvmhelpers.cpp Thu Apr 02 19:16:44 2009 +0200 +++ b/gen/llvmhelpers.cpp Thu Apr 02 20:56:39 2009 +0200 @@ -1082,6 +1082,17 @@ // we don't handle aliases either assert(!var->aliassym); + + // alloca if necessary + LLValue* allocaval = NULL; + if (!addr && (!var->ir.irLocal || !var->ir.irLocal->value)) + { + addr = DtoAlloca(DtoType(var->type), var->toChars()); + + // add debug info + if (global.params.symdebug) + DtoDwarfLocalVariable(addr, var); + } // referenced by nested function? #if DMDV2 @@ -1092,7 +1103,10 @@ { assert(var->ir.irLocal); if(!var->ir.irLocal->value) - var->ir.irLocal->value = addr ? addr : DtoAlloca(DtoType(var->type), var->toChars()); + { + assert(addr); + var->ir.irLocal->value = addr; + } else assert(!addr || addr == var->ir.irLocal->value); @@ -1113,14 +1127,11 @@ } assert(!var->ir.isSet()); + assert(addr); var->ir.irLocal = new IrLocal(var); - var->ir.irLocal->value = addr ? addr : DtoAlloca(DtoType(var->type), var->toChars()); + var->ir.irLocal->value = addr; } - // add debug info - if (global.params.symdebug) - DtoDwarfLocalVariable(var->ir.irLocal->value, var); - // return the alloca return var->ir.irLocal->value; }