Merge pull request #6261 from WalterBright/fix16699

fix Issue 16699 - [REG 2.070] stack corruption with scope(exit)
dlang · Nov 19, 2016 · 7776ed4 · 7776ed4
2 parents b2691f3 + a96a3f9
commit 7776ed4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/backend/cgelem.c b/src/backend/cgelem.c
@@ -5353,7 +5353,7 @@ elem *doptelem(elem *e, goal_t goal)
 
     /* If entire expression is a struct, and we can replace it with     */
     /* something simpler, do so.                                        */
-    if (goal & GOALstruct && e && tybasic(e->Ety) == TYstruct)
+    if (goal & GOALstruct && e && (tybasic(e->Ety) == TYstruct || tybasic(e->Ety) == TYarray))
         e = elstruct(e, goal);
 
     return e;

diff --git a/src/backend/el.c b/src/backend/el.c
@@ -3226,7 +3226,7 @@ void elem_print(elem *e)
   else
   {
         if ((e->Eoper == OPstrpar || e->Eoper == OPstrctor || e->Eoper == OPstreq) ||
-            e->Ety == TYstruct)
+            e->Ety == TYstruct || e->Ety == TYarray)
             if (e->ET)
                 dbg_printf("%d ", (int)type_size(e->ET));
         WRTYxx(e->Ety);

diff --git a/test/runnable/mars1.d b/test/runnable/mars1.d
@@ -1454,6 +1454,29 @@ void writeln(int v, int[] a)
 
 ////////////////////////////////////////////////////////////////////////
 
+// https://issues.dlang.org/show_bug.cgi?id=16699
+
+ulong[1] parseDateRange()
+{
+    try
+    {
+        ulong[1] result;
+        result[0] = 6;
+        return result;
+    }
+    finally
+    {
+    }
+}
+
+void test16699()
+{
+    ulong[1] range = parseDateRange();
+    assert(range[0] == 6);
+}
+
+////////////////////////////////////////////////////////////////////////
+
 int main()
 {
     testgoto();
@@ -1504,6 +1527,7 @@ int main()
     test15272();
     test15861();
     test15629();
+    test16699();
     printf("Success\n");
     return 0;
 }