From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 3 Oct 2012 14:21:20 +0000 (+0200)
Subject: re PR c++/54777 ([C++11] Comma operator in constexpr environment can cause ICE)
X-Git-Tag: misc/gccgo-go1_1_2~447
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75ab707c7532221207fb89647c555438166c6f89;p=thirdparty%2Fgcc.git

re PR c++/54777 ([C++11] Comma operator in constexpr environment can cause ICE)

	PR c++/54777
	* semantics.c (cxx_eval_constant_expression) <case COMPOUND_EXPR>: If
	not ignoring the second operand, pass the original second operand
	and not one with stripped nops to cxx_eval_constant_expression.

	* g++.dg/cpp0x/constexpr-ref4.C: New test.

From-SVN: r192036
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f868739be6ef..223e42a0d4c9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/54777
+	* semantics.c (cxx_eval_constant_expression) <case COMPOUND_EXPR>: If
+	not ignoring the second operand, pass the original second operand
+	and not one with stripped nops to cxx_eval_constant_expression.
+
 2012-10-01  Jason Merrill  <jason@redhat.com>
 
 	* decl.c (check_initializer): Set DECL_NONTRIVIALLY_INITIALIZED_P
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 1aa5a8b8b561..68cbb4ba8c40 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -7740,6 +7740,7 @@ cxx_eval_constant_expression (const constexpr_call *call, tree t,
 	    /* Check that the LHS is constant and then discard it.  */
 	    cxx_eval_constant_expression (call, op0, allow_non_constant,
 					  false, non_constant_p);
+	    op1 = TREE_OPERAND (t, 1);
 	    r = cxx_eval_constant_expression (call, op1, allow_non_constant,
 					      addr, non_constant_p);
 	  }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2120cb4d965d..659fa534d9f5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/54777
+	* g++.dg/cpp0x/constexpr-ref4.C: New test.
+
 2012-10-02  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/54778
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C
new file mode 100644
index 000000000000..6ae355a273f5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C
@@ -0,0 +1,18 @@
+// PR c++/54777
+// { dg-options -std=c++0x }
+
+struct S
+{
+  int s[1];
+  constexpr const int &foo (unsigned i) { return (i < 1 ? 0 : throw 1), s[i]; }
+  constexpr const int &bar (unsigned i) { return i < 1 ? s[i] : (throw 0, s[i]); }
+};
+
+int
+main ()
+{
+  constexpr S a {};
+  constexpr int i = a.foo (0);
+  constexpr int j = a.bar (0);
+  static_assert (i == j, "Ouch");
+}