diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2019-01-16 21:40:33 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2019-01-16 21:40:33 +0000 |
| commit | 10396eea184b75aa05c6050479b748dfe8a6978d (patch) | |
| tree | 33b190fb823e4d0813d1b72681a4bb2981092ff1 /gcc/c | |
| parent | a8a204051af71852f9c0ff1fc3405db868aeca82 (diff) | |
| download | gcc-10396eea184b75aa05c6050479b748dfe8a6978d.zip gcc-10396eea184b75aa05c6050479b748dfe8a6978d.tar.gz gcc-10396eea184b75aa05c6050479b748dfe8a6978d.tar.bz2 | |
Fix diagnostics for never-defined inline and nested functions (PR c/88720, PR c/88726).
Bugs 88720 and 88726 report issues where a function is declared inline
in an inner scope, resulting in spurious diagnostics about it being
declared but never defined when that scope is left (possibly in some
cases also wrongly referring to the function as a nested function).
These are regressions that were introduced with the support for C99
inline semantics in 4.3 (they don't appear with 4.2; it's possible
some aspects of the bugs might have been introduced later than 4.3).
For the case of functions being wrongly referred to as nested,
DECL_EXTERNAL was not the right condition for a function being
non-nested; TREE_PUBLIC is appropriate for the case of non-nested
functions with external linkage, while !b->nested means this is the
outermost scope in which the function was declared and so avoids
catching the case of a file-scope static being redeclared inline
inside a function.
For the non-nested, external-linkage case, the code attempts to avoid
duplicate diagnostics by diagnosing only when scope != external_scope,
but actually scope == external_scope is more appropriate, as it's only
when the file and external scopes are popped that the code can
actually tell whether a function ended up being defined, and all such
functions will appear in the (GCC-internal) external scope.
Bootstrapped with no regressions on x86_64-pc-linux-gnu.
gcc/c:
Backport from mainline
2019-01-07 Joseph Myers <joseph@codesourcery.com>
PR c/88720
PR c/88726
* c-decl.c (pop_scope): Use TREE_PUBLIC and b->nested to determine
whether a function is nested, not DECL_EXTERNAL. Diagnose inline
functions declared but never defined only for external scope, not
for other scopes.
gcc/testsuite:
Backport from mainline
2019-01-07 Joseph Myers <joseph@codesourcery.com>
PR c/88720
PR c/88726
* gcc.dg/inline-40.c, gcc.dg/inline-41.c: New tests.
From-SVN: r267987
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/c/c-decl.c | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 86a4c96..ab2eae1 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,15 @@ +2019-01-16 Joseph Myers <joseph@codesourcery.com> + + Backport from mainline + 2019-01-07 Joseph Myers <joseph@codesourcery.com> + + PR c/88720 + PR c/88726 + * c-decl.c (pop_scope): Use TREE_PUBLIC and b->nested to determine + whether a function is nested, not DECL_EXTERNAL. Diagnose inline + functions declared but never defined only for external scope, not + for other scopes. + 2018-01-02 Segher Boessenkool <segher@kernel.crashing.org> Backport from trunk diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index ed609d2..14a3832 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -1235,8 +1235,9 @@ pop_scope (void) && DECL_ABSTRACT_ORIGIN (p) != 0 && DECL_ABSTRACT_ORIGIN (p) != p) TREE_ADDRESSABLE (DECL_ABSTRACT_ORIGIN (p)) = 1; - if (!DECL_EXTERNAL (p) + if (!TREE_PUBLIC (p) && !DECL_INITIAL (p) + && !b->nested && scope != file_scope && scope != external_scope) { @@ -1252,7 +1253,7 @@ pop_scope (void) in the same translation unit." */ if (!flag_gnu89_inline && !lookup_attribute ("gnu_inline", DECL_ATTRIBUTES (p)) - && scope != external_scope) + && scope == external_scope) pedwarn (input_location, 0, "inline function %q+D declared but never defined", p); DECL_EXTERNAL (p) = 1; |