diff options
| -rw-r--r-- | tccgen.c | 29 | ||||
| -rw-r--r-- | tcctok.h | 1 | ||||
| -rw-r--r-- | tests/tcctest.c | 13 |
3 files changed, 43 insertions, 0 deletions
@@ -4238,6 +4238,35 @@ ST_FUNC void unary(void) vpushi(is_compatible_types(&type1, &type2)); } break; + case TOK_builtin_choose_expr: + { + int saved_nocode_wanted, c; + next(); + skip('('); + c = expr_const(); + skip(','); + if (!c) { + saved_nocode_wanted = nocode_wanted; + nocode_wanted = 1; + } + expr_eq(); + if (!c) { + vpop(); + nocode_wanted = saved_nocode_wanted; + } + skip(','); + if (c) { + saved_nocode_wanted = nocode_wanted; + nocode_wanted = 1; + } + expr_eq(); + if (c) { + vpop(); + nocode_wanted = saved_nocode_wanted; + } + skip(')'); + } + break; case TOK_builtin_constant_p: { int saved_nocode_wanted, res; @@ -132,6 +132,7 @@ DEF(TOK_VISIBILITY1, "visibility") DEF(TOK_VISIBILITY2, "__visibility__") DEF(TOK_builtin_types_compatible_p, "__builtin_types_compatible_p") + DEF(TOK_builtin_choose_expr, "__builtin_choose_expr") DEF(TOK_builtin_constant_p, "__builtin_constant_p") DEF(TOK_builtin_frame_address, "__builtin_frame_address") DEF(TOK_builtin_return_address, "__builtin_return_address") diff --git a/tests/tcctest.c b/tests/tcctest.c index 57226f7..10033a4 100644 --- a/tests/tcctest.c +++ b/tests/tcctest.c @@ -2685,6 +2685,9 @@ int constant_p_var; void builtin_test(void) { + short s; + int i; + long long ll; #if GCC_MAJOR >= 3 COMPAT_TYPE(int, int); COMPAT_TYPE(int, unsigned int); @@ -2704,6 +2707,16 @@ void builtin_test(void) printf("res = %d\n", __builtin_constant_p(1 + 2)); printf("res = %d\n", __builtin_constant_p(&constant_p_var)); printf("res = %d\n", __builtin_constant_p(constant_p_var)); + s = 1; + ll = 2; + i = __builtin_choose_expr (1 != 0, ll, s); + printf("bce: %d\n", i); + i = __builtin_choose_expr (1 != 1, ll, s); + printf("bce: %d\n", i); + i = sizeof (__builtin_choose_expr (1, ll, s)); + printf("bce: %d\n", i); + i = sizeof (__builtin_choose_expr (0, ll, s)); + printf("bce: %d\n", i); } #ifndef _WIN32 |