moved the enum member analysis

Author: abulgit

compiler/src/dmd/enumsem.d

@@ -718,3 +718,46 @@ void enumMemberSemantic(Scope* sc, EnumMember em)
     assert(em.origValue);
     em.semanticRun = PASS.semanticdone;
 }
+
+/*********************************
+ * Perform semantic2 analysis on enum declaration `ed`.
+ */
+void enumSemantic2(Scope* sc, EnumDeclaration ed)
+{
+    if (ed.semanticRun >= PASS.semantic2done)
+        return;
+
+    if (ed.semanticRun < PASS.semanticdone)
+    {
+        error(ed.loc, "forward reference to enum `%s`", ed.toChars());
+        ed.semanticRun = PASS.semantic2done;
+        return;
+    }
+
+    assert(ed.semanticRun == PASS.semanticdone);
+    ed.semanticRun = PASS.semantic2;
+
+    if (!ed.members || !ed.symtab || ed.errors)
+    {
+        ed.semanticRun = PASS.semantic2done;
+        return;
+    }
+
+    if (sc)
+    {
+        sc = sc.startCTFE();
+        sc.setNoFree();
+    }
+
+    // Ensure all enum members have their values computed
+    foreach (s; *ed.members)
+    {
+        if (EnumMember em = s.isEnumMember())
+        {
+            if (em.semanticRun < PASS.semanticdone)
+                em.dsymbolSemantic(sc);
+        }
+    }
+
+    ed.semanticRun = PASS.semantic2done;
+}

compiler/src/dmd/semantic2.d

@@ -692,6 +692,12 @@ private extern(C++) final class Semantic2Visitor : Visitor
         visit(cast(AggregateDeclaration) cd);
     }
 
+    override void visit(EnumDeclaration ed)
+    {
+        import dmd.enumsem : enumSemantic2;
+        enumSemantic2(sc, ed);
+    }
+
     override void visit(TupleDeclaration td)
     {
         td.foreachVar((s) { s.accept(this); });

compiler/src/dmd/statementsem.d

@@ -1961,31 +1961,16 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
                 ed = ds.isEnumDeclaration();
 
             // Circular references
-            if (ed)
+            // Check if enum semantic analysis is not yet complete
+            if (ed && ed.semanticRun < PASS.semantic2done)
             {
-                // Check if inside the initializer of one of the enum's members
-                for (Scope* scx = sc; scx; scx = scx.enclosing)
-                {
-                    if (scx.scopesym && scx.scopesym.isEnumDeclaration() && scx.scopesym == ed)
-                    {
-                        error(ss.loc, "cannot use `final switch` on enum `%s` while it is being defined", ed.toChars());
-                        sc.pop();
-                        return setError();
-                    }
-                }
-
-                // Check if enum semantic analysis is not yet complete
-                if (ed.semanticRun < PASS.semanticdone)
-                {
-                    error(ss.loc, "cannot use `final switch` on enum `%s` while it is being defined", ed.toChars());
-                    sc.pop();
-                    return setError();
-                }
+                error(ss.loc, "cannot use `final switch` on enum `%s` while it is being defined", ed.toChars());
+                sc.pop();
+                return setError();
             }
 
             if (ed && ss.cases.length < ed.members.length)
             {
-                // Remove the old check for incomplete enum members
                 int missingMembers = 0;
                 const maxShown = global.params.v.errorSupplementCount();
             Lmembers: