From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 28 Nov 2018 08:50:53 +0000 (+0000)
Subject: 	PR c++/87476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04a73995e2c8e1f73234a220d0037427c762362f;p=thirdparty%2Fgcc.git

	PR c++/87476
	* typeck2.c (digest_init_r): Re-add handing of signed/unsigned char
	strings and add it to the initialization of wide array from non-wide
	string diagnostics too.

	* g++.dg/cpp0x/pr87476-1.C: New test.
	* g++.dg/cpp0x/pr87476-2.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266547 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fea3cf665074..c0f04d5a0597 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2018-11-28  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/87476
+	* typeck2.c (digest_init_r): Re-add handing of signed/unsigned char
+	strings and add it to the initialization of wide array from non-wide
+	string diagnostics too.
+
 2018-11-27  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/88187
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index fec1db00ca4c..d0b12352a058 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1063,7 +1063,9 @@ digest_init_r (tree type, tree init, int nested, int flags,
 
 	  if (TYPE_PRECISION (typ1) == BITS_PER_UNIT)
 	    {
-	      if (char_type != char_type_node)
+	      if (char_type != char_type_node
+		  && char_type != signed_char_type_node
+		  && char_type != unsigned_char_type_node)
 		{
 		  if (complain & tf_error)
 		    error_at (loc, "char-array initialized from wide string");
@@ -1072,7 +1074,9 @@ digest_init_r (tree type, tree init, int nested, int flags,
 	    }
 	  else
 	    {
-	      if (char_type == char_type_node)
+	      if (char_type == char_type_node
+		  || char_type == signed_char_type_node
+		  || char_type == unsigned_char_type_node)
 		{
 		  if (complain & tf_error)
 		    error_at (loc,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 411a3c8c7785..f205d65a819d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2018-11-28  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/87476
+	* g++.dg/cpp0x/pr87476-1.C: New test.
+	* g++.dg/cpp0x/pr87476-2.C: New test.
+
 	PR c++/88215
 	* c-c++-common/ubsan/pr88215.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr87476-1.C b/gcc/testsuite/g++.dg/cpp0x/pr87476-1.C
new file mode 100644
index 000000000000..31df51a228c3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr87476-1.C
@@ -0,0 +1,13 @@
+// PR c++/87476
+// { dg-do compile { target c++11 } }
+
+template <int>
+struct S {
+  void operator () () { constexpr unsigned char p[1] {}; }
+};
+
+void
+foo ()
+{
+  S<0>{} ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr87476-2.C b/gcc/testsuite/g++.dg/cpp0x/pr87476-2.C
new file mode 100644
index 000000000000..fac0ec1173dd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr87476-2.C
@@ -0,0 +1,23 @@
+// PR c++/87476
+// { dg-do compile { target c++11 } }
+
+void f0 () { constexpr char p[] = "11111"; }
+void f1 () { constexpr unsigned char p[] = "11111"; }
+void f2 () { constexpr signed char p[] = "11111"; }
+template <int N>
+void f3 () { constexpr char p[] = "11111"; }
+template <int N>
+void f4 () { constexpr unsigned char p[] = "11111"; }
+template <int N>
+void f5 () { constexpr signed char p[] = "11111"; }
+
+void
+baz ()
+{
+  f0 ();
+  f1 ();
+  f2 ();
+  f3<0> ();
+  f4<0> ();
+  f5<0> ();
+}