2004-12-21 James A. Morrison <phython@gcc.gnu.org>
+ PR c/18963
+ * c-decl.c (pushdecl): Remove block trying to merge static function
+ declarations at block scope to file scope declarations.
+
+2004-12-21 James A. Morrison <phython@gcc.gnu.org>
+
PR c/18596
* c-parse.in (initdcl): Don't process a declaration if start_decl fails.
(notype_initdcl): Don't process a declaration if start_decl fails.
}
}
}
- /* Similarly, a declaration of a function with static linkage at
- block scope must be checked against any existing declaration
- of that function at file scope. */
- else if (TREE_CODE (x) == FUNCTION_DECL && scope != file_scope
- && !TREE_PUBLIC (x) && !DECL_INITIAL (x))
- {
- if (warn_nested_externs && !DECL_IN_SYSTEM_HEADER (x))
- warning ("nested static declaration of %qD", x);
-
- while (b && !B_IN_FILE_SCOPE (b))
- b = b->shadowed;
-
- if (b && same_translation_unit_p (x, b->decl)
- && duplicate_decls (x, b->decl))
- {
- bind (name, b->decl, scope, /*invisible=*/false, /*nested=*/true);
- return b->decl;
- }
- else
- {
- bind (name, x, file_scope, /*invisible=*/true, /*nested=*/false);
- nested = true;
- }
- }
warn_if_shadowing (x);
2004-12-21 James A. Morrison <phython@gcc.gnu.org>
+ PR c/18963
+ * gcc.dg/pr18963-1.c: New test.
+
+2004-12-21 James A. Morrison <phython@gcc.gnu.org>
+
PR c/18596
* gcc.dg/funcdef-storage-1.c (foo): Remove.
* gcc.dg/pr18596-1.c: Use dg-error.