Issue 7358 - final switch over enum should add throwing default in de…

…bug mode at least Add a throwing default case when compiled with asserts on.
yebblies · Oct 28, 2012 · b9ad0b8 · b9ad0b8
1 parent 4c67f3a
commit b9ad0b8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/statement.c b/src/statement.c
@@ -3272,7 +3272,7 @@ Statement *SwitchStatement::semantic(Scope *sc)
     }
 #endif
 
-    if (!sc->sw->sdefault && (!isFinal || needswitcherror))
+    if (!sc->sw->sdefault && (!isFinal || needswitcherror || global.params.useAssert))
     {   hasNoDefault = 1;
 
         if (!isFinal)

diff --git a/test/runnable/testswitch.d b/test/runnable/testswitch.d
@@ -470,6 +470,32 @@ static assert(!is(typeof(
    )));
 
 
+/*****************************************/
+
+void test7358()
+{
+    static void test7358a()
+    {
+        enum X { A = 1, B = 2 }
+
+        auto x = X.A | X.B;
+
+        final switch(x)
+        {
+        case X.A:
+        case X.B:
+            break;
+        }
+    }
+
+    bool exception;
+    try
+        test7358a();
+    catch (Error)
+        exception = true;
+    assert(exception);
+}
+
 /*****************************************/
 
 int main()
@@ -493,6 +519,7 @@ int main()
     test17();
     test19();
     test20();
+    test7358();
 
     printf("Success\n");
     return 0;