Move

Author: abulgit

compiler/src/dmd/semantic2.d

@@ -696,6 +696,39 @@ private extern(C++) final class Semantic2Visitor : Visitor
     {
         td.foreachVar((s) { s.accept(this); });
     }
+
+    override void visit(EnumDeclaration ed)
+    {
+        //printf("EnumDeclaration::semantic2('%s')\n", ed.toChars());
+        if (ed.semanticRun >= PASS.semantic2done)
+            return;
+        if (ed.semanticRun == PASS.semantic2)
+            return;
+
+        ed.semanticRun = PASS.semantic2;
+
+        if (!ed.members || ed.errors)
+        {
+            ed.semanticRun = PASS.semantic2done;
+            return;
+        }
+
+        if (ed.isAnonymous() || !ed.members)
+        {
+            ed.semanticRun = PASS.semantic2done;
+            return;
+        }
+
+        // Process each enum member
+        for (size_t i = 0; i < ed.members.length; i++)
+        {
+            EnumMember em = (*ed.members)[i].isEnumMember();
+            if (em)
+                em.dsymbolSemantic(sc);
+        }
+
+        ed.semanticRun = PASS.semantic2done;
+    }
 }
 
 /**

compiler/src/dmd/statementsem.d

@@ -1959,6 +1959,15 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
                 ed = ds.isEnumDeclaration(); // typedef'ed enum
             if (!ed && te && ((ds = te.toDsymbol(sc)) !is null))
                 ed = ds.isEnumDeclaration();
+
+            // Replace the above check with this better check
+            if (ed && (ed.semanticRun < PASS.semanticdone || ed.semanticRun < PASS.semantic2done))
+            {
+                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)
             {
                 int missingMembers = 0;

compiler/test/fail_compilation/fix20867.d

@@ -0,0 +1,20 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/fix20867.d(14): Error: cannot use `final switch` on enum `E` while it is being defined
+---
+*/
+
+// Test case from Issue #20867
+enum E
+{
+    a = 3,
+    b = () {
+        E e;
+        final switch (e)  // This should error out instead of segfaulting
+        {
+            case E.a: break;
+        }
+        return 4;
+    } ()
+}