Merge fix from upstream.

D-Programming-GDC · Apr 9, 2013 · c6e1377 · c6e1377
1 parent fec4b87
commit c6e1377
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/gcc/d/dfrontend/cast.c b/gcc/d/dfrontend/cast.c
@@ -2491,13 +2491,15 @@ int typeMerge(Scope *sc, Expression *e, Type **pt, Expression **pe1, Expression
     {
         e2 = e2->castTo(sc, t1);
         t2 = t1;
+        t = t1;
         goto Lagain;
     }
     else if (t2->ty == Tvector && t1->ty != Tvector &&
              e1->implicitConvTo(t2))
     {
         e1 = e1->castTo(sc, t2);
         t1 = t2;
+        t = t1;
         goto Lagain;
     }
     else if (t1->isintegral() && t2->isintegral())

diff --git a/gcc/testsuite/gdc.test/runnable/testxmm.d b/gcc/testsuite/gdc.test/runnable/testxmm.d
@@ -1149,6 +1149,18 @@ void test9304()
 
 /*****************************************/
 
+void test9910()
+{
+    float4 f = [1, 1, 1, 1];
+    auto works = f + 3;
+    auto bug = 3 + f;
+
+    assert (works.array == [4,4,4,4]);
+    assert (bug.array == [4,4,4,4]);    // no property 'array' for type 'int'
+}
+
+/*****************************************/
+
 int main()
 {
     test1();
@@ -1175,6 +1187,7 @@ int main()
     test7413_2();
 //    test9200();
     test9304();
+    test9910();
 
     return 0;
 }