From: Jason Merrill <jason@redhat.com>
Date: Wed, 6 May 2015 02:24:49 +0000 (-0400)
Subject: Fix obj-c++.dg/encode-10.mm with cxx_dialect == cxx11.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=81b6a6c55bd5b2549dbaa16a87e736c4c8ac1bf5;p=gcc.git

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
---

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);