summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2015-05-06 02:24:49 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2015-05-06 02:24:49 +0000
commit9abecca2c45c9c54728f8bb34df5ad09f40e39c7 (patch)
treedc9c6dfcada3548c8a65b00cb33eb3a575c9353e
parentb6a74ba4d0d3be3f289f6084e3d7ef00eca1c266 (diff)
downloadgcc-9abecca2c45c9c54728f8bb34df5ad09f40e39c7.tar.gz
Fix obj-c++.dg/encode-10.mm with cxx_dialect == cxx11.
* constexpr.c (potential_constant_expression_1) [AT_ENCODE_EXPR]: Return false. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222841 138bc75d-0d04-0410-961f-82ee72b054a4
-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 09476c43a01..fc543e6dba9 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 9ebb6406878..f35ec1e013f 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);