# HG changeset patch
# User Frits van Bommel <fvbommel wxs.nl>
# Date 1244025155 -7200
# Node ID 630fc54f7c1e9ea34fdc4c2c8867ea3f0a84b8b4
# Parent  8bf5fa175555c5227c181bf7e523c1b4f05fe353
Fix a bug in DtoNestedInit and update an unrelated comment.

diff -r 8bf5fa175555 -r 630fc54f7c1e gen/nested.cpp
--- a/gen/nested.cpp	Wed Jun 03 04:12:28 2009 +0200
+++ b/gen/nested.cpp	Wed Jun 03 12:32:35 2009 +0200
@@ -192,7 +192,7 @@
                 FuncDeclaration *parentfunc = getParentFunc(vd, true);
                 assert(parentfunc && "No parent function for nested variable?");
                 
-                val = DtoGEPi(val, 0, vardepth);
+                val = DtoGEPi(nestedVar, 0, vardepth);
                 val = DtoAlignedLoad(val, (std::string(".frame.") + parentfunc->toChars()).c_str());
             }
             val = DtoGEPi(val, 0, vd->ir.irLocal->nestedIndex, vd->toChars());
diff -r 8bf5fa175555 -r 630fc54f7c1e gen/toobj.cpp
--- a/gen/toobj.cpp	Wed Jun 03 04:12:28 2009 +0200
+++ b/gen/toobj.cpp	Wed Jun 03 12:32:35 2009 +0200
@@ -612,7 +612,8 @@
 //         void* xgetMembers;
 //         void function() ictor;
 //
-//         void*[4] reserved; // useless to us
+//         version(D_Version2)
+//             void*[4] reserved; // useless to us
 //         }
 
     // resolve ModuleInfo