From 28aa0e2bf30bd4bb607afecbd3b30ba5aaa05df2 Mon Sep 17 00:00:00 2001
From: Alexey Prokhin <alexey.prokhin@yandex.ru>
Date: Fri, 25 Feb 2011 22:29:28 +0300
Subject: [PATCH] Add missing postblit call

---
 gen/statements.cpp | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/gen/statements.cpp b/gen/statements.cpp
index 59951e57..04507de9 100644
--- a/gen/statements.cpp
+++ b/gen/statements.cpp
@@ -45,9 +45,27 @@ void CompoundStatement::toIR(IRState* p)
     }
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 
+static void callPostblitHelper(Loc &loc, Expression *exp, LLValue *val)
+{
+#if DMDV2
+    Type *tb = exp->type->toBasetype();
+    if ((exp->op == TOKvar || exp->op == TOKdotvar || exp->op == TOKstar) &&
+        tb->ty == Tstruct)
+    {   StructDeclaration *sd = ((TypeStruct *)tb)->sym;
+        if (sd->postblit)
+        {
+            FuncDeclaration *fd = sd->postblit;
+            fd->codegen(Type::sir);
+            Expressions args;
+            DFuncValue dfn(fd, fd->ir.irFunc->func, val);
+            DtoCallFunction(loc, Type::basic[Tvoid], &dfn, &args);
+        }
+    }
+#endif
+}
+
 void ReturnStatement::toIR(IRState* p)
 {
     Logger::println("ReturnStatement::toIR(): %s", loc.toChars());
@@ -77,22 +95,9 @@ void ReturnStatement::toIR(IRState* p)
             // store return value
             DtoAssign(loc, rvar, e);
 
-#if DMDV2
-            // Call postBlit()
-            Type *tb = exp->type->toBasetype();
-            if ((exp->op == TOKvar || exp->op == TOKdotvar || exp->op == TOKstar) &&
-                tb->ty == Tstruct)
-            {   StructDeclaration *sd = ((TypeStruct *)tb)->sym;
-                if (sd->postblit)
-                {
-                    FuncDeclaration *fd = sd->postblit;
-                    fd->codegen(Type::sir);
-                    Expressions args;
-                    DFuncValue dfn(fd, fd->ir.irFunc->func, e->getLVal());
-                    DtoCallFunction(loc, Type::basic[Tvoid], &dfn, &args);
-                }
-            }
-#endif
+            // call postblit if necessary
+            if (e->isLVal())
+                callPostblitHelper(loc, exp, e->getLVal());
 
             // emit scopes
             DtoEnclosingHandlers(loc, NULL);
@@ -123,6 +128,9 @@ void ReturnStatement::toIR(IRState* p)
             if (Logger::enabled())
                 Logger::cout() << "return value is '" <<*v << "'\n";
 
+            // call postblit if necessary
+            callPostblitHelper(loc, exp, v);
+
             IrFunction* f = p->func();
             // Hack around LDC assuming structs and static arrays are in memory:
             // If the function returns a struct or a static array, and the return
@@ -157,6 +165,7 @@ void ReturnStatement::toIR(IRState* p)
                     Logger::cout() << "return value after cast: " << *v << '\n';
             }
 
+            // emit scopes
             DtoEnclosingHandlers(loc, NULL);
 
             #ifndef DISABLE_DEBUG_INFO