Merge pull request #618 from 9rnsr/fix7285

Issue 7285 - Implicit fixed-size array cast
dlang · Jan 15, 2012 · 61d4b88 · 61d4b88
2 parents 83d567e + ede5c98
commit 61d4b88
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/cast.c b/src/cast.c
@@ -1831,10 +1831,14 @@ int typeMerge(Scope *sc, Expression *e, Type **pt, Expression **pe1, Expression
     }
     else if ((t1->ty == Tsarray || t1->ty == Tarray) && t1->implicitConvTo(t2))
     {
+        if (t1->ty == Tsarray && e2->op == TOKarrayliteral)
+            goto Lt1;
         goto Lt2;
     }
     else if ((t2->ty == Tsarray || t2->ty == Tarray) && t2->implicitConvTo(t1))
     {
+        if (t2->ty == Tsarray && e1->op == TOKarrayliteral)
+            goto Lt2;
         goto Lt1;
     }
     /* If one is mutable and the other invariant, then retry

diff --git a/test/runnable/xtest46.d b/test/runnable/xtest46.d
@@ -4379,6 +4379,23 @@ void test7196()
     auto y = (&foo7196)(1.0); // fail
 }
 
+/***************************************************/
+// 7285
+
+int[2] spam7285()
+{
+    int[2] ab;
+    if (true)
+        return (true) ? ab : [0, 0]; // Error
+    else
+        return (true) ? [0, 0] : ab; // OK
+}
+
+void test7285()
+{
+    auto sa = spam7285();
+}
+
 /***************************************************/
 
 int main()
@@ -4590,6 +4607,7 @@ int main()
     test7168();
     test7170();
     test7196();
+    test7285();
 
     printf("Success\n");
     return 0;