From 25a34b0236ffcf23e9bc29826475729ccfef7c38 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Mon, 7 Jan 2019 19:25:41 +0000
Subject: [PATCH] PR c++/88741 - wrong error with initializer-string.

	* decl.c (cp_complete_array_type): Strip any location wrappers.

	* g++.dg/init/array50.C: New test.

From-SVN: r267656
---
 gcc/cp/ChangeLog                    |  5 +++++
 gcc/cp/decl.c                       |  1 +
 gcc/testsuite/ChangeLog             |  5 +++++
 gcc/testsuite/g++.dg/init/array50.C | 12 ++++++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/init/array50.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 60c8ae1934e..5267b9d24f7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88741 - wrong error with initializer-string.
+	* decl.c (cp_complete_array_type): Strip any location wrappers.
+
 2019-01-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
 	PR c++/88261
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 15bc4887a59..1fc7a1acf56 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8433,6 +8433,7 @@ cp_complete_array_type (tree *ptype, tree initial_value, bool do_default)
 	{
 	  vec<constructor_elt, va_gc> *v = CONSTRUCTOR_ELTS (initial_value);
 	  tree value = (*v)[0].value;
+	  STRIP_ANY_LOCATION_WRAPPER (value);
 
 	  if (TREE_CODE (value) == STRING_CST
 	      && v->length () == 1)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4bb56349adf..c79593d7f0e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88741 - wrong error with initializer-string.
+	* g++.dg/init/array50.C: New test.
+
 2019-01-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
 	PR c++/88261
diff --git a/gcc/testsuite/g++.dg/init/array50.C b/gcc/testsuite/g++.dg/init/array50.C
new file mode 100644
index 00000000000..a5c129d0eb5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/array50.C
@@ -0,0 +1,12 @@
+// PR c++/88741
+
+template <class T>
+void foo()
+{
+  char row[] = {"test"};
+}
+  
+void bar()
+{
+  foo<int>();
+} 
-- 
2.30.2