Merge pull request #4467 from 9rnsr/fix12799

Issue 12799 - Forward reference to nested enum with struct.sizeof
dlang · Mar 25, 2015 · 0358a7d · 0358a7d
2 parents 6577ce7 + 945b754
commit 0358a7d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/struct.c b/src/struct.c
@@ -355,6 +355,13 @@ unsigned AggregateDeclaration::size(Loc loc)
                 VarDeclaration *v = s->isVarDeclaration();
                 if (v)
                 {
+                    /* Bugzilla 12799: enum a = ...; is a VarDeclaration and
+                     * STCmanifest is already set in parssing stage. So we can
+                     * check this before the semantic() call.
+                     */
+                    if (v->storage_class & STCmanifest)
+                        return 0;
+
                     if (v->scope)
                         v->semantic(NULL);
                     if (v->storage_class & (STCstatic | STCextern | STCtls | STCgshared | STCmanifest | STCctfe | STCtemplateparameter))

diff --git a/test/compilable/compile1.d b/test/compilable/compile1.d
@@ -709,6 +709,16 @@ final class C12703
     S12703 s = S12703(1);
 }
 
+/***************************************************/
+// 12799
+
+struct A12799
+{
+    int a;
+    enum C = A12799.sizeof;
+    enum D = C; // OK <- Error
+}
+
 /***************************************************/
 // 13236