Merge pull request #4205 from 9rnsr/fix13831

Issue 13831 - DMD crash on newing struct with overlapped fields in CTFE
dlang · Dec 11, 2014 · 048a508 · 048a508
2 parents 95e4aa8 + 5266a05
commit 048a508
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/src/ctfeexpr.c b/src/ctfeexpr.c
@@ -1848,7 +1848,8 @@ void assignInPlace(Expression *dest, Expression *src)
             assert(o->op == e->op);
             assignInPlace(o, e);
         }
-        else if (e->type->ty == Tsarray && o->type->ty == Tsarray && e->op != TOKvoid)
+        else if (e->type->ty == Tsarray && e->op != TOKvoid &&
+                 o->type->ty == Tsarray)
         {
             assignInPlace(o, e);
         }

diff --git a/src/interpret.c b/src/interpret.c
@@ -2796,7 +2796,7 @@ class Interpreter : public Visitor
     void visit(StructLiteralExp *e)
     {
     #if LOG
-        printf("%s StructLiteralExp::interpret() %s\n", e->loc.toChars(), e->toChars());
+        printf("%s StructLiteralExp::interpret() %s ownedByCtfe = %d\n", e->loc.toChars(), e->toChars(), e->ownedByCtfe);
     #endif
         if (e->ownedByCtfe)
         {
@@ -2944,6 +2944,9 @@ class Interpreter : public Visitor
             if (e->member)
             {
                 Expression *se = e->newtype->defaultInitLiteral(e->loc);
+                se = interpret(se, istate);
+                if (exceptionOrCant(se))
+                    return;
                 result = interpret(e->member, istate, e->arguments, se);
             }
             else

diff --git a/test/compilable/interpret3.d b/test/compilable/interpret3.d
@@ -5982,6 +5982,35 @@ struct S10937
 enum test10937 = S10937(7);
 enum west10937 = S10937(2);
 
+/**************************************************
+    13831
+**************************************************/
+
+struct Vector13831()
+{
+}
+
+struct Coord13831
+{
+    union
+    {
+        struct { short x; }
+        Vector13831!() vector;
+    }
+}
+
+struct Chunk13831
+{
+    this(Coord13831)
+    {
+        coord = coord;
+    }
+
+    Coord13831 coord;
+
+    static const Chunk13831* unknownChunk = new Chunk13831(Coord13831());
+}
+
 /**************************************************
     7732
 **************************************************/