Readd lost error on local static function decls

see testcase: block scope decls for functions can't use static (allowed is only extern or none). This got lost in commit 85690480.

Michael Matz committed 6 years ago

Commit b476a5f1 parent 6cb68c33 files · +11 −5Browse files

Unified · Split

3 files

             }
 #endif
             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
                    declaration list */
                 sym = type.ref;

  || defined test_func_2 \
  || defined test_func_3 \
  || defined test_func_4 \
- || defined test_func_5
+ || defined test_func_5 \
+ || defined test_func_6
 #if defined test_func_1
 int hello(int);
 #elif defined test_func_4
 static int hello(int);
 #endif
 int main () {
-#if defined test_func_5
+#if defined test_func_6
     static
 #endif
     int hello(int);

 hello: a = 123
 [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
 [test_func_4]
 hello: a = 123
 [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]
 main : 1 ; 1
 bar  : 3 ; 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]

Keyboard shortcuts