From 5d2246a32c638e9caea109e5dd9f182f5cd43b2a Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Thu, 7 May 2020 21:10:42 -0400 Subject: [PATCH] c++: Sorry about type-dependent arg for __builtin_has_attribute [PR90915] Until 92104 is fixed, let's sorry rather than crash. PR c++/90915 * parser.c (cp_parser_has_attribute_expression): Sorry on a type-dependent argument. * g++.dg/ext/builtin-has-attribute.C: New test. --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 7 ++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/ext/builtin-has-attribute.C | 8 ++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/ext/builtin-has-attribute.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 52422cef10f..d8ad1d63bd4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2020-05-18 Marek Polacek + + PR c++/90915 + * parser.c (cp_parser_has_attribute_expression): Sorry on a + type-dependent argument. + 2020-05-18 Marek Polacek DR 1512 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 41712bfdc2c..e944841f5a3 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -8679,7 +8679,12 @@ cp_parser_has_attribute_expression (cp_parser *parser) location_t atloc = cp_lexer_peek_token (parser->lexer)->location; if (tree attr = cp_parser_gnu_attribute_list (parser, /*exactly_one=*/true)) { - if (oper != error_mark_node) + if (oper == error_mark_node) + /* Nothing. */; + else if (type_dependent_expression_p (oper)) + sorry_at (atloc, "%<__builtin_has_attribute%> with dependent argument " + "not supported yet"); + else { /* Fold constant expressions used in attributes first. */ cp_check_const_attributes (attr); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 453e581a3fa..67e9394ed92 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-05-18 Marek Polacek + + PR c++/90915 + * g++.dg/ext/builtin-has-attribute.C: New test. + 2020-05-18 Martin Sebor PR middle-end/92815 diff --git a/gcc/testsuite/g++.dg/ext/builtin-has-attribute.C b/gcc/testsuite/g++.dg/ext/builtin-has-attribute.C new file mode 100644 index 00000000000..3438dd59ba3 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/builtin-has-attribute.C @@ -0,0 +1,8 @@ +// PR c++/90915 +// { dg-do compile { target c++11 } } + +template +void foo () +{ + static_assert(!__builtin_has_attribute(T::a, aligned), ""); // { dg-message "sorry, unimplemented: .__builtin_has_attribute. with dependent argument not supported yet" } +} -- 2.30.2