Merge pull request #9072 from WalterBright/fix19473

fix Issue 19473 - DMD Segfault on circular struct reference
dlang · Dec 13, 2018 · 5aa95b5 · 5aa95b5
2 parents b191ad4 + 3d99269
commit 5aa95b5
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/src/dmd/aggregate.d b/src/dmd/aggregate.d
@@ -40,6 +40,7 @@ enum Sizeok : int
 {
     none,           // size of aggregate is not yet able to compute
     fwd,            // size of aggregate is ready to compute
+    inProcess,      // in the midst of computing the size
     done,           // size of aggregate is set correctly
 }
 
@@ -77,7 +78,7 @@ extern (C++) abstract class AggregateDeclaration : ScopeDsymbol
     uint structsize;        // size of struct
     uint alignsize;         // size of struct for alignment purposes
     VarDeclarations fields; // VarDeclaration fields
-    Sizeok sizeok;          // set when structsize contains valid data
+    Sizeok sizeok = Sizeok.none;  // set when structsize contains valid data
     Dsymbol deferred;       // any deferred semantic2() or semantic3() symbol
     bool isdeprecated;      // true if deprecated
 

diff --git a/src/dmd/aggregate.h b/src/dmd/aggregate.h
@@ -30,7 +30,8 @@ enum Sizeok
 {
     SIZEOKnone,         // size of aggregate is not yet able to compute
     SIZEOKfwd,          // size of aggregate is ready to compute
-    SIZEOKdone          // size of aggregate is set correctly
+    SIZEOKinProcess,    // in the midst of computing the size
+    SIZEOKdone,         // size of aggregate is set correctly
 };
 
 enum Baseok

diff --git a/src/dmd/dstruct.d b/src/dmd/dstruct.d
@@ -350,6 +350,12 @@ extern (C++) class StructDeclaration : AggregateDeclaration
         //printf("StructDeclaration::finalizeSize() %s, sizeok = %d\n", toChars(), sizeok);
         assert(sizeok != Sizeok.done);
 
+        if (sizeok == Sizeok.inProcess)
+        {
+            return;
+        }
+        sizeok = Sizeok.inProcess;
+
         //printf("+StructDeclaration::finalizeSize() %s, fields.dim = %d, sizeok = %d\n", toChars(), fields.dim, sizeok);
 
         fields.setDim(0);   // workaround
@@ -363,7 +369,10 @@ extern (C++) class StructDeclaration : AggregateDeclaration
             s.setFieldOffset(this, &offset, isunion);
         }
         if (type.ty == Terror)
+        {
+            errors = true;
             return;
+        }
 
         // 0 sized struct's are set to 1 byte
         if (structsize == 0)

diff --git a/test/fail_compilation/test19473.d b/test/fail_compilation/test19473.d
@@ -0,0 +1,31 @@
+/* TEST_OUTPUT:
+---
+fail_compilation/test19473.d(14): Error: union `test19473.P` no size because of forward reference
+---
+ */
+
+// https://issues.dlang.org/show_bug.cgi?id=19473
+
+struct A {
+        P p;
+
+        struct UTpl() {
+                union {
+                        P p;
+                }
+        }
+
+        alias U = UTpl!();
+}
+
+alias B = A.U;
+
+struct C {
+        union D {
+                B b;
+        }
+}
+
+union P {
+        C.D p;
+}