fix dlang#22925: ICE: AssertError@expression.d(508) with invalid case range statement (dlang#22926)

Fixes: dlang#22925

Author: ibuclaw

compiler/src/dmd/statementsem.d

@@ -1898,8 +1898,8 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
             ss.condition = ErrorExp.get();
         ss.condition = ss.condition.optimize(WANTvalue);
         ss.condition = ss.condition.checkGC(sc);
-        if (ss.condition.op == EXP.error)
-            conditionError = true;
+        if (conditionError || ss.condition.op == EXP.error)
+            return setError();
 
         bool needswitcherror = false;
 
@@ -1915,7 +1915,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
         ss._body = ss._body.statementSemantic(sc);
         sc.inLoop = inLoopSave;
 
-        if (conditionError || (ss._body && ss._body.isErrorStatement()))
+        if (ss._body && ss._body.isErrorStatement())
         {
             sc.pop();
             return setError();
@@ -2357,6 +2357,13 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
             lval = fval + 256;
         }
 
+        // If the first and last values aren't integer types, then the toInteger()
+        // call above would have resulted in an error.
+        if  (!crs.first.type.isIntegral() || !crs.last.type.isIntegral())
+        {
+            errors = true;
+        }
+
         if (errors)
             return setError();
 

compiler/test/fail_compilation/diag10783.d

@@ -1,9 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/diag10783.d(15): Error: no property `type` for `event` of type `diag10783.Event`
-fail_compilation/diag10783.d(10):        struct `Event` defined here
-fail_compilation/diag10783.d(15): Error: undefined identifier `En`
+fail_compilation/diag10783.d(14): Error: no property `type` for `event` of type `diag10783.Event`
+fail_compilation/diag10783.d(9):        struct `Event` defined here
 ---
 */
 

compiler/test/fail_compilation/diag9358.d

@@ -1,10 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/diag9358.d(13): Error: `x` must be of integral or string type, it is a `double`
-fail_compilation/diag9358.d(15): Error: `case` expression must be a compile-time `string` or an integral constant, not `1.1`
-fail_compilation/diag9358.d(16): Error: `case` expression must be a compile-time `string` or an integral constant, not `2.1`
-fail_compilation/diag9358.d(26): Error: `case` expression must be a compile-time `string` or an integral constant, not `z`
+fail_compilation/diag9358.d(11): Error: `x` must be of integral or string type, it is a `double`
+fail_compilation/diag9358.d(24): Error: `case` expression must be a compile-time `string` or an integral constant, not `z`
 ---
 */
 void main()

compiler/test/fail_compilation/fail22925.d

@@ -0,0 +1,40 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/fail22925.d(15): Error: integer constant expression expected instead of `"s"`
+fail_compilation/fail22925.d(15): Error: integer constant expression expected instead of `"z"`
+fail_compilation/fail22925.d(23): Error: `s` must be of integral or string type, it is a `real`
+fail_compilation/fail22925.d(35): Error: cannot implicitly convert expression `2.8` of type `double` to `int`
+fail_compilation/fail22925.d(35): Error: cannot implicitly convert expression `4.2` of type `double` to `int`
+---
+*/
+void test1(string s)
+{
+    switch (s)
+    {
+        case "s": .. case "z":
+            break;
+        default:
+            break;
+    }
+}
+void test2(real s)
+{
+    switch (s)
+    {
+        case 1.0: .. case 2.7:
+            break;
+        default:
+            break;
+    }
+}
+void test3(int s)
+{
+    switch (s)
+    {
+        case 2.8: .. case 4.2:
+            break;
+        default:
+            break;
+    }
+}

compiler/test/fail_compilation/test_switch_error.d

@@ -2,9 +2,7 @@
 https://issues.dlang.org/show_bug.cgi?id=22514
 TEST_OUTPUT:
 ---
-fail_compilation/test_switch_error.d(13): Error: undefined identifier `doesNotExist`
-fail_compilation/test_switch_error.d(16): Error: undefined identifier `alsoDoesNotExits`
-fail_compilation/test_switch_error.d(19): Error: duplicate `case 2` in `switch` statement
+fail_compilation/test_switch_error.d(11): Error: undefined identifier `doesNotExist`
 ---
 ++/
 
@@ -104,10 +102,6 @@ void test5(int i)
 TEST_OUTPUT:
 ---
 fail_compilation/test_switch_error.d(513): Error: undefined identifier `undefinedFunc`
-fail_compilation/test_switch_error.d(517): Error: `case` expression must be a compile-time `string` or an integral constant, not `Strukt(1)`
-fail_compilation/test_switch_error.d(518): Error: `case` variables have to be `const` or `immutable`
-fail_compilation/test_switch_error.d(518): Error: `case` variables not allowed in `final switch` statements
-fail_compilation/test_switch_error.d(519): Error: `case` variables not allowed in `final switch` statements
 fail_compilation/test_switch_error.d(522): Error: undefined identifier `undefinedFunc2`
 ---
 ++/
@@ -144,8 +138,6 @@ void errorsWithErrors(int param, immutable int constant)
 TEST_OUTPUT:
 ---
 fail_compilation/test_switch_error.d(622): Error: undefined identifier `undefinedFunc`
-fail_compilation/test_switch_error.d(624): Error: `case` expression must be a compile-time `string` or an integral constant, not `SubtypeOfInt(2)`
-fail_compilation/test_switch_error.d(625): Error: `case` expression must be a compile-time `string` or an integral constant, not `SubtypeOfIntMethod()`
 ---
 ++/
 #line 600