From 8fca809b59757519517e67a23b6df005e9e452dd Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo@gcc.gnu.org>
Date: Wed, 17 Jan 2018 20:29:25 +0000
Subject: [PATCH] re PR c++/81054 (ICE with volatile variable in constexpr
 function)

/cp
2018-01-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/81054
	* constexpr.c (ensure_literal_type_for_constexpr_object): Return
	error_mark_node when we give an error.
	* decl.c (cp_finish_decl): Use the latter.

/testsuite
2018-01-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/81054
	* g++.dg/cpp0x/constexpr-ice19.C: New.

From-SVN: r256817
---
 gcc/testsuite/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a73d83b..a1ebfc3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,10 @@
+2018-01-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/81054
+	* g++.dg/cpp0x/constexpr-ice19.C: New.
+
 2018-01-17  Will Schmidt  <will_schmidt@vnet.ibm.com>
+
 	* gcc.target/powerpc/fold-vec-mergehl-char.c: New.
 	* gcc.target/powerpc/fold-vec-mergehl-double.c: New.
 	* gcc.target/powerpc/fold-vec-mergehl-float.c: New.
-- 
2.7.4