Issue 7516 - Postblit not called for structs returned from a ternary …

…operator
dlang · Jul 23, 2017 · 3f497ef · 3f497ef
1 parent 366c8e9
commit 3f497ef
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -1130,7 +1130,7 @@ bool arrayExpressionToCommonType(Scope *sc, Expressions *exps, Type **pt)
             continue;
         }
 
-        e = e->isLvalue() ? callCpCtor(sc, e) : valueNoDtor(e);
+        e = doCopyOrMove(sc, e);
 
         if (t0 && !t0->equals(e->type))
         {
@@ -1349,6 +1349,24 @@ Expression *callCpCtor(Scope *sc, Expression *e)
     return e;
 }
 
+/************************************************
+ * Handle the postblit call on lvalue, or the move of rvalue.
+ */
+Expression *doCopyOrMove(Scope *sc, Expression *e)
+{
+    if (e->op == TOKquestion)
+    {
+        CondExp *ce = (CondExp *)e;
+        ce->e1 = doCopyOrMove(sc, ce->e1);
+        ce->e2 = doCopyOrMove(sc, ce->e2);
+    }
+    else
+    {
+        e = e->isLvalue() ? callCpCtor(sc, e) : valueNoDtor(e);
+    }
+    return e;
+}
+
 /****************************************
  * Now that we know the exact type of the function we're calling,
  * the arguments[] need to be adjusted:
@@ -1651,10 +1669,6 @@ bool functionParameters(Loc loc, Scope *sc, TypeFunction *tf,
                 else
                     arg = toDelegate(arg, arg->type, sc);
             }
-            else
-            {
-//                arg = arg->isLvalue() ? callCpCtor(sc, arg) : valueNoDtor(arg);
-            }
 
             //printf("arg: %s\n", arg->toChars());
             //printf("type: %s\n", arg->type->toChars());
@@ -1874,7 +1888,7 @@ bool functionParameters(Loc loc, Scope *sc, TypeFunction *tf,
             }
             else if (ts)
             {
-                arg = arg->isLvalue() ? callCpCtor(sc, arg) : valueNoDtor(arg);
+                arg = doCopyOrMove(sc, arg);
             }
             else if (anythrow && firstthrow <= i && i <= lastthrow && gate)
             {
@@ -12038,7 +12052,7 @@ Expression *CatAssignExp::semantic(Scope *sc)
         if (e2->checkPostblit(sc, tb2))
             return new ErrorExp();
         e2 = e2->castTo(sc, tb1next);
-        e2 = e2->isLvalue() ? callCpCtor(sc, e2) : valueNoDtor(e2);
+        e2 = doCopyOrMove(sc, e2);
     }
     else if (tb1->ty == Tarray &&
         (tb1next->ty == Tchar || tb1next->ty == Twchar) &&

diff --git a/src/expression.h b/src/expression.h
@@ -72,7 +72,7 @@ TemplateDeclaration *getFuncTemplateDecl(Dsymbol *s);
 Expression *valueNoDtor(Expression *e);
 int modifyFieldVar(Loc loc, Scope *sc, VarDeclaration *var, Expression *e1);
 Expression *resolveAliasThis(Scope *sc, Expression *e, bool gag = false);
-Expression *callCpCtor(Scope *sc, Expression *e);
+Expression *doCopyOrMove(Scope *sc, Expression *e);
 Expression *resolveOpDollar(Scope *sc, ArrayExp *ae, Expression **pe0);
 Expression *resolveOpDollar(Scope *sc, ArrayExp *ae, IntervalExp *ie, Expression **pe0);
 Expression *integralPromotions(Expression *e, Scope *sc);

diff --git a/src/func.c b/src/func.c
@@ -1791,8 +1791,8 @@ void FuncDeclaration::semantic3(Scope *sc)
                         /* Bugzilla 10789:
                          * If NRVO is not possible, all returned lvalues should call their postblits.
                          */
-                        if (!nrvo_can && exp->isLvalue())
-                            exp = callCpCtor(sc2, exp);
+                        if (!nrvo_can)
+                            exp = doCopyOrMove(sc2, exp);
 
                         checkEscape(sc2, exp, false);
                     }

diff --git a/src/struct.c b/src/struct.c
@@ -1303,7 +1303,7 @@ bool StructDeclaration::fit(Loc loc, Scope *sc, Expressions *elements, Type *sty
         if (e->op == TOKerror)
             return false;
 
-        (*elements)[i] = e->isLvalue() ? callCpCtor(sc, e) : valueNoDtor(e);
+        (*elements)[i] = doCopyOrMove(sc, e);
     }
     return true;
 }