Allow strings in __builtin_constant_p

tccgen.c: - Fix handling __builtin_constant_p tests/bug.c: - Remove tst3 tests/tcctest.c: - Add new tests for __builtin_constant_p

herman ten brugge committed 6 years ago

Commit c9bbd4e1 parent 4a16beb3 files · +6 −9Browse files

Unified · Split

3 files

         break;
     case TOK_builtin_constant_p:
 	parse_builtin_params(1, "e");
-	n = (vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
+	n = (vtop->r & (VT_VALMASK | VT_LVAL)) == VT_CONST &&
+            !((vtop->r & VT_SYM) && vtop->sym->a.addrtaken);
 	vtop--;
 	vpushi(n);
         break;

 #include <stdio.h>
 #include <stdarg.h>
-void tst3(void)
-{
-  /* Should VT_SYM be checked for TOK_builtin_constant_p */
-  int r = __builtin_constant_p("c");
-  if (r == 0) printf("%d\n",r);
-}
 int compile_errors(void)
 {
 #if TEST == 1
 int
 main(void)
 {
-  tst3();
 }

 int constant_p_var;
+int func(void);
 void builtin_test(void)
 {
     short s;
 #else
     printf("res8 = %d\n", __builtin_constant_p(i && 0 ? i : 34));
 #endif
+    printf("res9 = %d\n", __builtin_constant_p("hi"));
+    printf("res10 = %d\n", __builtin_constant_p(func()));
     s = 1;
     ll = 2;
     i = __builtin_choose_expr (1 != 0, ll, s);

Keyboard shortcuts