aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2020-05-07 21:10:42 -0400
committerMarek Polacek <polacek@redhat.com>2020-05-18 18:07:18 -0400
commit5d2246a32c638e9caea109e5dd9f182f5cd43b2a (patch)
treea04197831e09ef6c5a636e2ff3c92ceb9c892bb3 /gcc
parent7a41fcde6c67faafab8c8ee2a31140999383dcef (diff)
downloadgcc-5d2246a32c638e9caea109e5dd9f182f5cd43b2a.zip
gcc-5d2246a32c638e9caea109e5dd9f182f5cd43b2a.tar.gz
gcc-5d2246a32c638e9caea109e5dd9f182f5cd43b2a.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c7
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/ext/builtin-has-attribute.C8
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 52422ce..d8ad1d6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
2020-05-18 Marek Polacek <polacek@redhat.com>
+ PR c++/90915
+ * parser.c (cp_parser_has_attribute_expression): Sorry on a
+ type-dependent argument.
+
+2020-05-18 Marek Polacek <polacek@redhat.com>
+
DR 1512
PR c++/87699
* call.c (add_builtin_candidate) <case EQ_EXPR>: Create candidate
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 41712bf..e944841 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 453e581..67e9394 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-18 Marek Polacek <polacek@redhat.com>
+
+ PR c++/90915
+ * g++.dg/ext/builtin-has-attribute.C: New test.
+
2020-05-18 Martin Sebor <msebor@redhat.com>
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 0000000..3438dd5
--- /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<typename T>
+void foo ()
+{
+ static_assert(!__builtin_has_attribute(T::a, aligned), ""); // { dg-message "sorry, unimplemented: .__builtin_has_attribute. with dependent argument not supported yet" }
+}