[typing] don't forget to cast result of conditional if needed

src/kernel_internals/typing/cabs2cil.ml

@@ -7233,9 +7233,11 @@ and doExp local_env
           clean_up_chunk_locals se2;
           let loc = e2.expr_loc in
           let e2' = match e2'o with None -> Cil.one ~loc | Some e -> e in
+          let _,e2' = castTo t2 tresult e2' in
           finishExp [] empty e2' tresult;
         end else if asconst <> CNoConst && is_true_cond = `CFalse then begin
           clean_up_chunk_locals se3;
+          let _,e3' = castTo t3 tresult e3' in
           finishExp [] empty e3' tresult
         end else begin
           if not (isEmpty se2) then

tests/syntax/compile_constant.c

 #define M0(x) (x)*(x)<4.0?0.0:1.0
 char pixels[] = {M0(0.0), M0(1), M0(2.0f)};
 
+/* tests below should evaluate to 2. */
+
 char test_neg = { (-0.) ? 1. : 2. };
 
 char test_ge = { ((-1.) >= 0.) ? 1. : 2. };
 
-char test_cast = { 1 >= (0?1U:(-1)) ? 1. : 2. };
+char test_cast[] = { 1 >= (0?1U:(-1)) ? 1. : 2.,
+                   ((double)1) >= (0?1U:(-1)) ? 1. : 2. };
 
 extern int f(void);
 
+/* no call should be evaluated. */
 char no_call[] = { 1 ? 1 : f(), 0?f():2 };

tests/syntax/oracle/compile_constant.res.oracle

@@ -3,6 +3,6 @@
 char pixels[3] = {(char)0.0, (char)0.0, (char)1.0};
 char test_neg = (char)2.;
 char test_ge = (char)2.;
-char test_cast = (char)2.;
+char test_cast[2] = {(char)2., (char)2.};
 char no_call[2] = {(char)1, (char)2};