Merge pull request #2611 from 9rnsr/fix11105

[REG2.064a] Issue 11105 - Error on struct with multidimentional static array initialization from its element
dlang · Oct 3, 2013 · efcd62c · efcd62c
2 parents 6c8f9ff + d4638f1
commit efcd62c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -4695,13 +4695,12 @@ Expression *StructLiteralExp::semantic(Scope *sc)
         if (stype)
             telem = telem->addMod(stype->mod);
         Type *origType = telem;
-        if (!e->implicitConvTo(telem))
+        while (!e->implicitConvTo(telem) && telem->toBasetype()->ty == Tsarray)
         {
             /* Static array initialization, as in:
              *  T[3][5] = e;
              */
-            while (telem->toBasetype()->ty == Tsarray)
-                telem = telem->toBasetype()->nextOf();
+            telem = telem->toBasetype()->nextOf();
         }
 
         if (!e->implicitConvTo(telem))

diff --git a/test/runnable/structlit.d b/test/runnable/structlit.d
@@ -1002,6 +1002,19 @@ const          date9775c2 = Date9775(2012, 12, 21);
 enum  Date9775 date9775e1 = Date9775(2012, 12, 21);
 enum           date9775e2 = Date9775(2012, 12, 21);
 
+/********************************************/
+// 11105
+
+struct S11105
+{
+    int[2][1] a21;
+}
+
+void test11105()
+{
+    S11105 s = S11105([1, 2]);
+}
+
 /********************************************/
 // 11147
 
@@ -1072,6 +1085,7 @@ int main()
     test9116();
     test9293();
     test9566();
+    test11105();
     test11147();
 
     printf("Success\n");