From: Marek Polacek <polacek@redhat.com>
Date: Fri, 8 Jan 2016 19:08:37 +0000 (+0000)
Subject: re PR c++/68449 (ICE in cxx_eval_constant_expression on atomic_load in C++)
X-Git-Tag: upstream/12.2.0~49634
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd8f5bb2978922bf0cf51eef3486f4da83df556d;p=platform%2Fupstream%2Fgcc.git

re PR c++/68449 (ICE in cxx_eval_constant_expression on atomic_load in C++)

	PR c++/68449
	* constexpr.c (cxx_eval_constant_expression): Handle NULL initializer.

	* g++.dg/pr68449.C: New.

From-SVN: r232176
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6b0eae6..49dc0cf 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-08  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/68449
+	* constexpr.c (cxx_eval_constant_expression): Handle NULL initializer.
+
 2016-01-08  Jason Merrill  <jason@redhat.com>
 
 	* constexpr.c (cxx_eval_call_expression): Remove convert_to_void
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index c6c3467..7b60271 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -3184,7 +3184,8 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	r = TARGET_EXPR_INITIAL (r);
       if (VAR_P (r))
 	if (tree *p = ctx->values->get (r))
-	  r = *p;
+	  if (*p != NULL_TREE)
+	    r = *p;
       if (DECL_P (r))
 	{
 	  if (!ctx->quiet)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 235eab7..c7162e2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-08  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/68449
+	* g++.dg/pr68449.C: New.
+
 2016-01-08  Alan Lawrence  <alan.lawrence@arm.com>
 
 	PR tree-optimization/68707
diff --git a/gcc/testsuite/g++.dg/pr68449.C b/gcc/testsuite/g++.dg/pr68449.C
new file mode 100644
index 0000000..7d86fe9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr68449.C
@@ -0,0 +1,9 @@
+// PR c++/68449
+// { dg-do compile }
+// { dg-options "-Wsign-compare" }
+
+int
+foo (int a)
+{
+  return __extension__ ({ int b; b; }) < 0;
+}