MahnoKropotkinvich/tinycc
1
0
Fork 0
mirror of git://repo.or.cz/tinycc.git synced 2026-06-25 22:34:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow mixing old/new function prototypes
Some checks failed
build and test / test-x86_64-linux (push) Has been cancelled
Details
build and test / test-x86_64-osx (push) Has been cancelled
Details
build and test / test-aarch64-osx (push) Has been cancelled
Details
build and test / test-x86_64-win32 (push) Has been cancelled
Details
build and test / test-i386-win32 (push) Has been cancelled
Details
build and test / test-armv7-linux (push) Has been cancelled
Details
build and test / test-aarch64-linux (push) Has been cancelled
Details
build and test / test-riscv64-linux (push) Has been cancelled
Details

Browse Source 
This fixes another external testsuite failure
This commit is contained in:
herman ten brugge 2025-08-15 09:59:11 +02:00
parent 571868c4f7
commit 19fdef46f9
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tccgen.c
View File

@ -8517,7 +8517,7 @@ static int decl(int l)
{ {
int v, has_init, r, oldint; int v, has_init, r, oldint;
CType type, btype; CType type, btype;
Sym *sym; Sym *sym, *s;
AttributeDef ad, adbase; AttributeDef ad, adbase;
ElfSym *esym; ElfSym *esym;
@ -8589,6 +8589,21 @@ static int decl(int l)
if (sym->f.func_type == FUNC_OLD && l == VT_CONST) { if (sym->f.func_type == FUNC_OLD && l == VT_CONST) {
func_vt = type; func_vt = type;
decl(VT_CMP); decl(VT_CMP);
/* Allow mixing old/new prototypes
* void func(float a);
* int main(void) { func(1.0); }
* void func(a) float a; { printf("%g\n", a); }
*/
s = sym_find(v);
if (type.ref->next && // skip old func(); definitions
s && s->type.ref &&
s->type.ref->f.func_type == FUNC_NEW) {
sym->f.func_type = FUNC_NEW;
if (!is_compatible_types(&s->type, &type))
tcc_error("incompatible redefinition of '%s'",
get_tok_str(v, NULL));
}
} }
if ((type.t & (VT_EXTERN|VT_INLINE)) == (VT_EXTERN|VT_INLINE)) { if ((type.t & (VT_EXTERN|VT_INLINE)) == (VT_EXTERN|VT_INLINE)) {
@ -8646,6 +8661,9 @@ static int decl(int l)
while ((sym = sym->next) != NULL) { while ((sym = sym->next) != NULL) {
if (!(sym->v & ~SYM_FIELD)) if (!(sym->v & ~SYM_FIELD))
expect("identifier"); expect("identifier");
if (type.ref->f.func_type == FUNC_OLD &&
sym->type.t == VT_FLOAT)
sym->type.t = VT_DOUBLE;
if (sym->type.t == VT_VOID) if (sym->type.t == VT_VOID)
sym->type = int_type; sym->type = int_type;
} }
@ -8693,9 +8711,6 @@ static int decl(int l)
if (sym->type.t != VT_VOID) if (sym->type.t != VT_VOID)
tcc_error("redefinition of parameter '%s'", tcc_error("redefinition of parameter '%s'",
get_tok_str(v, NULL)); get_tok_str(v, NULL));
if (func_vt.ref->f.func_type == FUNC_OLD &&
type.t == VT_FLOAT)
type.t = VT_DOUBLE;
convert_parameter_type(&type); convert_parameter_type(&type);
sym->type = type; sym->type = type;
} else if (type.t & VT_TYPEDEF) { } else if (type.t & VT_TYPEDEF) {

8
tests/tests2/133_old_func.c
View File

@ -6,6 +6,8 @@ float x;
return 2.0 * x; return 2.0 * x;
} }
void func(float a);
int int
main(void) main(void)
{ {
@ -13,6 +15,7 @@ main(void)
printf("%g %g\n", fx(2.0), fy(10.0)); printf("%g %g\n", fx(2.0), fy(10.0));
printf("%g %g\n", fx(2.0f), fy(10.0f)); printf("%g %g\n", fx(2.0f), fy(10.0f));
func(1);
} }
float fy(x) float fy(x)
@ -21,3 +24,8 @@ float x;
return 3.0 * x; return 3.0 * x;
} }
void func(a)
float a;
{
printf("%g\n", a);
}

1
tests/tests2/133_old_func.expect
View File

@ -1,2 +1,3 @@
4 30 4 30
4 30 4 30
1