On 5/26/22 20:34, Marek Polacek wrote:
Here the C compiler crashes because a FUNCTION_DECL got into
get_priority -> default_conversion, and the C FE's version of d_c
specifically asserts that it doesn't get a FUNCTION_DECL. All uses
of default_conversion in c-attribs.cc are guarded by != IDENTIFIER_NODE
&& != FUNCTION_DECL, but get_priority was only checking IDENTIFIER_NODE.
Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk?
OK.
PR c/90658
gcc/c-family/ChangeLog:
* c-attribs.cc (get_priority): Check FUNCTION_DECL.
gcc/testsuite/ChangeLog:
* c-c++-common/attr-cdtor-1.c: New test.
---
gcc/c-family/c-attribs.cc | 2 +-
gcc/testsuite/c-c++-common/attr-cdtor-1.c | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/c-c++-common/attr-cdtor-1.c
diff --git a/gcc/c-family/c-attribs.cc b/gcc/c-family/c-attribs.cc
index 4dc68dbe82a..c8d96723f4c 100644
--- a/gcc/c-family/c-attribs.cc
+++ b/gcc/c-family/c-attribs.cc
@@ -1895,7 +1895,7 @@ get_priority (tree args, bool is_destructor)
}
arg = TREE_VALUE (args);
- if (TREE_CODE (arg) == IDENTIFIER_NODE)
+ if (TREE_CODE (arg) == IDENTIFIER_NODE || TREE_CODE (arg) == FUNCTION_DECL)
goto invalid;
if (arg == error_mark_node)
return DEFAULT_INIT_PRIORITY;
diff --git a/gcc/testsuite/c-c++-common/attr-cdtor-1.c
b/gcc/testsuite/c-c++-common/attr-cdtor-1.c
new file mode 100644
index 00000000000..ea61336c404
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/attr-cdtor-1.c
@@ -0,0 +1,6 @@
+/* PR c/90658 */
+/* { dg-do compile } */
+
+void f ();
+void g1 () __attribute__ ((constructor(f))); /* { dg-error "priorities must be
integers" } */
+void g2 () __attribute__ ((destructor(f))); /* { dg-error "priorities must be
integers" } */
base-commit: 367740bf6d3a6627798b3955e5d85efc7549ef50
