fix Issue 14344 - Wrong opBinary call in construction

dlang · Mar 26, 2015 · a39502d · a39502d
1 parent 5c1fedc
commit a39502d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -11411,9 +11411,18 @@ Expression *AssignExp::semantic(Scope *sc)
             }
             else    // Bugzilla 11355
             {
-                Expression *e = op_overload(sc);
-                if (e)
-                    return e;
+                AggregateDeclaration *ad2 = isAggregate(e2x->type);
+                if (ad2 && ad2->aliasthis && !(att2 && e2x->type == att2))
+                {
+                    if (!att2 && e2->type->checkAliasThisRec())
+                        att2 = e2->type;
+
+                    /* Rewrite (e1 op e2) as:
+                     *      (e1 op e2.aliasthis)
+                     */
+                    e2 = new DotIdExp(e2->loc, e2, ad2->aliasthis->ident);
+                    return semantic(sc);
+                }
             }
         }
         else if (op == TOKassign)

diff --git a/test/runnable/opover.d b/test/runnable/opover.d
@@ -1068,6 +1068,37 @@ void test12778()
     }
 }
 
+/**************************************/
+// 14344
+
+struct S14344
+{
+    S14344 opBinary(string op)(S14344 v)
+    {
+        static assert(0);
+    }
+    S14344 opAssign()(S14344 v)
+    {
+        static assert(0);
+    }
+}
+
+struct S14344Mix
+{
+    S14344 s;
+    alias s this;
+}
+
+class C14344
+{
+    S14344Mix height() { return S14344Mix(); }
+
+    void update()
+    {
+        S14344 height = this.height;
+    }
+}
+
 /**************************************/
 
 int main()