https://gcc.gnu.org/g:3741efc7402bf421bd77e5e2b30ae513a9867372
commit r11-11488-g3741efc7402bf421bd77e5e2b30ae513a9867372 Author: Jakub Jelinek <ja...@redhat.com> Date: Tue Jan 9 15:37:04 2024 +0100 c-family: copy attribute diagnostic fixes [PR113262] The copy attributes is allowed on decls as well as types and even has checks whether decl (set to *node) is DECL_P or TYPE_P, but for diagnostics unconditionally uses DECL_SOURCE_LOCATION (decl), which obviously only works if it applies to a decl. 2024-01-09 Jakub Jelinek <ja...@redhat.com> PR c/113262 * c-attribs.c (handle_copy_attribute): Don't use DECL_SOURCE_LOCATION (decl) if decl is not DECL_P, use input_location instead. Formatting fixes. * gcc.dg/pr113262.c: New test. (cherry picked from commit c9fc7f398e8b330ff12ec8a29bfa058b6daf6624) Diff: --- gcc/c-family/c-attribs.c | 32 ++++++++++++++------------------ gcc/testsuite/gcc.dg/pr113262.c | 6 ++++++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c index cdf89d66fe14..72c521467ade 100644 --- a/gcc/c-family/c-attribs.c +++ b/gcc/c-family/c-attribs.c @@ -2772,13 +2772,14 @@ handle_copy_attribute (tree *node, tree name, tree args, if (ref == error_mark_node) return NULL_TREE; + location_t loc = input_location; + if (DECL_P (decl)) + loc = DECL_SOURCE_LOCATION (decl); if (TREE_CODE (ref) == STRING_CST) { /* Explicitly handle this case since using a string literal as an argument is a likely mistake. */ - error_at (DECL_SOURCE_LOCATION (decl), - "%qE attribute argument cannot be a string", - name); + error_at (loc, "%qE attribute argument cannot be a string", name); return NULL_TREE; } @@ -2789,10 +2790,8 @@ handle_copy_attribute (tree *node, tree name, tree args, /* Similar to the string case, since some function attributes accept literal numbers as arguments (e.g., alloc_size or nonnull) using one here is a likely mistake. */ - error_at (DECL_SOURCE_LOCATION (decl), - "%qE attribute argument cannot be a constant arithmetic " - "expression", - name); + error_at (loc, "%qE attribute argument cannot be a constant arithmetic " + "expression", name); return NULL_TREE; } @@ -2800,12 +2799,11 @@ handle_copy_attribute (tree *node, tree name, tree args, { /* Another possible mistake (but indirect self-references aren't and diagnosed and shouldn't be). */ - if (warning_at (DECL_SOURCE_LOCATION (decl), OPT_Wattributes, + if (warning_at (loc, OPT_Wattributes, "%qE attribute ignored on a redeclaration " - "of the referenced symbol", - name)) - inform (DECL_SOURCE_LOCATION (node[1]), - "previous declaration here"); + "of the referenced symbol", name) + && DECL_P (node[1])) + inform (DECL_SOURCE_LOCATION (node[1]), "previous declaration here"); return NULL_TREE; } @@ -2825,7 +2823,8 @@ handle_copy_attribute (tree *node, tree name, tree args, ref = TREE_OPERAND (ref, 1); else break; - } while (!DECL_P (ref)); + } + while (!DECL_P (ref)); /* For object pointer expressions, consider those to be requests to copy from their type, such as in: @@ -2857,8 +2856,7 @@ handle_copy_attribute (tree *node, tree name, tree args, to a variable, or variable attributes to a function. */ if (warning (OPT_Wattributes, "%qE attribute ignored on a declaration of " - "a different kind than referenced symbol", - name) + "a different kind than referenced symbol", name) && DECL_P (ref)) inform (DECL_SOURCE_LOCATION (ref), "symbol %qD referenced by %qD declared here", ref, decl); @@ -2908,9 +2906,7 @@ handle_copy_attribute (tree *node, tree name, tree args, } else if (!TYPE_P (decl)) { - error_at (DECL_SOURCE_LOCATION (decl), - "%qE attribute must apply to a declaration", - name); + error_at (loc, "%qE attribute must apply to a declaration", name); return NULL_TREE; } diff --git a/gcc/testsuite/gcc.dg/pr113262.c b/gcc/testsuite/gcc.dg/pr113262.c new file mode 100644 index 000000000000..ee55183b587b --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr113262.c @@ -0,0 +1,6 @@ +/* PR c/113262 */ +/* { dg-do compile } */ +/* { dg-options "" } */ + +int [[gnu::copy ("")]] a; /* { dg-error "'copy' attribute argument cannot be a string" } */ +