Revert "better constant handling for expr_cond"

It produced wrong code with one of my test projects.
This reverts commit cd3d1a45f3.

tccgen.c

@@ -4040,10 +4040,6 @@ static void expr_cond(void)
 
     if (const_wanted) {
         expr_lor_const();
-    } else {
-        expr_lor();
-    }
-    if (const_wanted || ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST)) {
         if (tok == '?') {
             CType boolean;
             int c;
@@ -4065,6 +4061,7 @@ static void expr_cond(void)
                 vpop();
         }
     } else {
+        expr_lor();
         if (tok == '?') {
             next();
             if (vtop != vstack) {