Revert "REVERT PR diffblue#2490 switch-range commit"

hannes-steffenhagen-diffblue · hannes-steffenhagen-diffblue · commit b26337f1fb9b · 2018-08-13T15:24:12.000+01:00
This reverts commit 86eed1d.
diff --git a/src/ansi-c/c_typecheck_code.cpp b/src/ansi-c/c_typecheck_code.cpp
@@ -535,7 +535,7 @@ void c_typecheck_baset::typecheck_switch_case(code_switch_caset &code)
     exprt &case_expr=code.case_op();
     typecheck_expr(case_expr);
     implicit_typecast(case_expr, switch_op_type);
-    // make_constant(case_expr);
+    make_constant(case_expr);
   }
 }
 
@@ -562,8 +562,8 @@ void c_typecheck_baset::typecheck_gcc_switch_case_range(codet &code)
   typecheck_expr(code.op1());
   implicit_typecast(code.op0(), switch_op_type);
   implicit_typecast(code.op1(), switch_op_type);
-  // make_constant(code.op0());
-  // make_constant(code.op1());
+  make_constant(code.op0());
+  make_constant(code.op1());
 }
 
 void c_typecheck_baset::typecheck_gcc_local_label(codet &code)

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ void c_typecheck_baset::typecheck_switch_case(code_switch_caset &code)`
`535`	`535`	`exprt &case_expr=code.case_op();`
`536`	`536`	`typecheck_expr(case_expr);`
`537`	`537`	`implicit_typecast(case_expr, switch_op_type);`
`538`		`- // make_constant(case_expr);`
	`538`	`+ make_constant(case_expr);`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`
`@@ -562,8 +562,8 @@ void c_typecheck_baset::typecheck_gcc_switch_case_range(codet &code)`
`562`	`562`	`typecheck_expr(code.op1());`
`563`	`563`	`implicit_typecast(code.op0(), switch_op_type);`
`564`	`564`	`implicit_typecast(code.op1(), switch_op_type);`
`565`		`- // make_constant(code.op0());`
`566`		`- // make_constant(code.op1());`
	`565`	`+ make_constant(code.op0());`
	`566`	`+ make_constant(code.op1());`
`567`	`567`	`}`
`568`	`568`
`569`	`569`	`void c_typecheck_baset::typecheck_gcc_local_label(codet &code)`