# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1257599171 -3600
# Node ID b0dfdd5f600645c1390f5164eb4fe46bf1bb9664
# Parent  91af6d05338cd39399c0da30e1c3e13975044731
Make ref vars work with nesting.

diff -r 91af6d05338c -r b0dfdd5f6006 gen/llvmhelpers.cpp
--- a/gen/llvmhelpers.cpp	Sat Nov 07 13:51:05 2009 +0100
+++ b/gen/llvmhelpers.cpp	Sat Nov 07 14:06:11 2009 +0100
@@ -896,6 +896,21 @@
 
             Logger::println("vdtype = %s", vd->type->toChars());
 
+            // ref vardecls are generated when DMD lowers foreach to a for statement,
+            // and this is a hack to support them for this case only
+            if(vd->isRef())
+            {
+                if (!vd->ir.irLocal)
+                    vd->ir.irLocal = new IrLocal(vd);
+
+                ExpInitializer* ex = vd->init->isExpInitializer();
+                assert(ex && "ref vars must have expression initializer");
+                assert(ex->exp);
+                AssignExp* as = dynamic_cast<AssignExp*>(ex->exp);
+                assert(as && "ref vars must be initialized by an assign exp");
+                vd->ir.irLocal->value = as->e2->toElem(gIR)->getLVal();
+            }
+            
             // referenced by nested delegate?
         #if DMDV2
             if (vd->nestedrefs.dim) {
@@ -927,21 +942,6 @@
                     DtoDwarfLocalVariable(allocainst, vd);
                 }
             }
-            else if(vd->isRef())
-            {
-                // ref vardecls are generated when DMD lowers foreach to a for statement,
-                // and this is a hack to support them for this case only
-                if (!vd->ir.irLocal)
-                    vd->ir.irLocal = new IrLocal(vd);
-                    
-                ExpInitializer* ex = vd->init->isExpInitializer();
-                assert(ex && "ref vars must have expression initializer");
-                assert(ex->exp);
-                AssignExp* as = dynamic_cast<AssignExp*>(ex->exp);
-                assert(as && "ref vars must be initialized by an assign exp");
-                vd->ir.irLocal->value = as->e2->toElem(gIR)->getLVal();
-                return new DVarValue(vd->type, vd, vd->ir.getIrValue());
-            }
             else
             {
                 assert(vd->ir.irLocal->value);
@@ -949,7 +949,8 @@
 
             if (Logger::enabled())
                 Logger::cout() << "llvm value for decl: " << *vd->ir.irLocal->value << '\n';
-            DValue* ie = DtoInitializer(vd->ir.irLocal->value, vd->init);
+            if (!vd->isRef())
+                DValue* ie = DtoInitializer(vd->ir.irLocal->value, vd->init);
         }
 
         return new DVarValue(vd->type, vd, vd->ir.getIrValue());