github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-03-26 12:04:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Readd lost error on local static function decls

Browse Source 
see testcase: block scope decls for functions can't use static
(allowed is only extern or none).  This got lost in commit 85690480.
This commit is contained in:
Michael Matz 2019-12-16 06:54:18 +01:00
parent 6cb68c3a17
commit b476a5f478
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tccgen.c
View File

@ -7859,6 +7859,8 @@ static int decl0(int l, int is_for_loop_init, Sym *func_sym)
} }
#endif #endif
if ((type.t & VT_BTYPE) == VT_FUNC) { if ((type.t & VT_BTYPE) == VT_FUNC) {
if ((type.t & VT_STATIC) && (l == VT_LOCAL))
tcc_error("function without file scope cannot be static");
/* if old style function prototype, we accept a /* if old style function prototype, we accept a
declaration list */ declaration list */
sym = type.ref; sym = type.ref;

5
tests/tests2/60_errors_and_warnings.c
View File

@ -216,14 +216,15 @@ int x[3];
|| defined test_func_2 \ || defined test_func_2 \
|| defined test_func_3 \ || defined test_func_3 \
|| defined test_func_4 \ || defined test_func_4 \
|| defined test_func_5 || defined test_func_5 \
|| defined test_func_6
#if defined test_func_1 #if defined test_func_1
int hello(int); int hello(int);
#elif defined test_func_4 #elif defined test_func_4
static int hello(int); static int hello(int);
#endif #endif
int main () { int main () {
#if defined test_func_5 #if defined test_func_6
static static
#endif #endif
int hello(int); int hello(int);

9
tests/tests2/60_errors_and_warnings.expect
View File

@ -111,14 +111,17 @@ hello: a = 123
hello: a = 123 hello: a = 123
[test_func_3] [test_func_3]
60_errors_and_warnings.c:241: warning: static storage ignored for redefinition of 'hello' 60_errors_and_warnings.c:242: warning: static storage ignored for redefinition of 'hello'
hello: a = 123 hello: a = 123
[test_func_4] [test_func_4]
hello: a = 123 hello: a = 123
[test_func_5] [test_func_5]
60_errors_and_warnings.c:241: error: incompatible types for redefinition of 'hello' 60_errors_and_warnings.c:242: error: incompatible types for redefinition of 'hello'
[test_func_6]
60_errors_and_warnings.c:230: error: function without file scope cannot be static
[test_var_1] [test_var_1]
main : 1 ; 1 main : 1 ; 1
@ -131,6 +134,6 @@ main : 2 ; 2
bar : 3 ; 3 bar : 3 ; 3
[test_var_3] [test_var_3]
60_errors_and_warnings.c:273: error: incompatible types for redefinition of 'xxx' 60_errors_and_warnings.c:274: error: incompatible types for redefinition of 'xxx'
[test_var_4] [test_var_4]