summaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorglisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4>2014-02-03 19:07:55 +0000
committerglisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4>2014-02-03 19:07:55 +0000
commitcaf62483f30035efca2958615a466f73cc99880e (patch)
treeab881259a5ba57d9b1f3a45c2e5aedcfb8af1dd0 /gcc/cp
parentd86e71c1ed4560b20eb072908dab671e7daa467f (diff)
downloadgcc-caf62483f30035efca2958615a466f73cc99880e.tar.gz
2014-02-03 Marc Glisse <marc.glisse@inria.fr>
PR c++/53017 PR c++/59211 gcc/c-family/ * c-common.c (handle_aligned_attribute, handle_alloc_size_attribute, handle_vector_size_attribute, handle_nonnull_attribute): Call default_conversion on the attribute argument. (handle_nonnull_attribute): Increment the argument number. gcc/cp/ * tree.c (handle_init_priority_attribute): Call default_conversion on the attribute argument. gcc/ * doc/extend.texi (Function Attributes): Typo. gcc/testsuite/ * c-c++-common/attributes-1.c: New testcase. * g++.dg/cpp0x/constexpr-attribute2.C: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207436 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/tree.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e73246a4a66..5214d9a91ac 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-03 Marc Glisse <marc.glisse@inria.fr>
+
+ PR c++/53017
+ PR c++/59211
+ * tree.c (handle_init_priority_attribute): Call default_conversion on
+ the attribute argument.
+
2014-02-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58871
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index fe2ddabae1d..5567253a61a 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -3250,6 +3250,7 @@ handle_init_priority_attribute (tree* node,
int pri;
STRIP_NOPS (initp_expr);
+ initp_expr = default_conversion (initp_expr);
if (!initp_expr || TREE_CODE (initp_expr) != INTEGER_CST)
{