aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-05-05 22:24:49 -0400
committerJason Merrill <jason@gcc.gnu.org>2015-05-05 22:24:49 -0400
commit81b6a6c55bd5b2549dbaa16a87e736c4c8ac1bf5 (patch)
treedc9c6dfcada3548c8a65b00cb33eb3a575c9353e
parent32ad49af4c3cd925099ca3d4e29cb30d87d25738 (diff)
downloadgcc-81b6a6c55bd5b2549dbaa16a87e736c4c8ac1bf5.zip
gcc-81b6a6c55bd5b2549dbaa16a87e736c4c8ac1bf5.tar.gz
gcc-81b6a6c55bd5b2549dbaa16a87e736c4c8ac1bf5.tar.bz2
Fix obj-c++.dg/encode-10.mm with cxx_dialect == cxx11.
* constexpr.c (potential_constant_expression_1) [AT_ENCODE_EXPR]: Return false. From-SVN: r222841
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/constexpr.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 09476c43..fc543e6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2015-05-05 Jason Merrill <jason@redhat.com>
+ * constexpr.c (potential_constant_expression_1) [AT_ENCODE_EXPR]:
+ Return false.
+
* semantics.c (finish_call_expr): Check complain.
* decl2.c (reset_type_linkage_2): Update the DECL_NAME of a
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 9ebb640..f35ec1e 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -4159,6 +4159,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict,
case OBJ_TYPE_REF:
case TRANSACTION_EXPR:
case ASM_EXPR:
+ case AT_ENCODE_EXPR:
fail:
if (flags & tf_error)
error ("expression %qE is not a constant-expression", t);