Mercurial > projects > ldc

changeset 1467:630fc54f7c1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a bug in DtoNestedInit and update an unrelated comment.
author Frits van Bommel <fvbommel wxs.nl>
date Wed, 03 Jun 2009 12:32:35 +0200
parents 8bf5fa175555
children 7d1e815b4f76
files gen/nested.cpp gen/toobj.cpp
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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());
--- 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