meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "better constant handling for expr_cond" 

It produced wrong code with one of my test projects.
This reverts commit cd3d1a45f3.
master
grischka 2011-07-16 15:53:30 +02:00
parent adc80009c8
commit d7d8458888
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tccgen.c
View File

@ -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) {

2
tests/tcctest.c
View File

@ -2083,8 +2083,6 @@ void *bounds_checking_is_enabled()
return (ca != cp + 1) ? cp : NULL;
}
typedef int constant_negative_array_size_as_compile_time_assertion_idiom[(1 ? 2 : 0) - 1];
void c99_vla_test(int size1, int size2)
{
#if defined __i386__ || defined __x86_64__