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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 60c8ae1934eca33847f34dfe8f0e8c2560ff11ee..5267b9d24f70f0c91618bc3fd3ea5ee5578b6393 100644 (file)
--- 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 15bc4887a596849011c03f9cd98f147f5454a1d2..1fc7a1acf5601dcdb469c1207725327a911f4d82 100644 (file)
--- 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 4bb56349adff891e7d2358fb37ce46ef70cc52c6..c79593d7f0ebc1f93707b3bca74e5bd3185b0dcf 100644 (file)
--- 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 (file)
index 0000000..a5c129d
--- /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>();
+}