Since Martin Sebor's patch for PR 71625 to change braced array initializers
to STRING_CST in some cases, we need to be ready for STRING_CST with types
that are changed by tsubst. fold_convert doesn't know how to deal with
STRING_CST, which is reasonable; we really shouldn't expect it to here. So
let's handle STRING_CST separately.
Tested x86_64-pc-linux-gnu, applying to trunk.
PR c++/90966
* pt.c (tsubst_copy) [STRING_CST]: Don't use fold_convert.
---
gcc/cp/pt.c | 13 ++++++++++++-
gcc/testsuite/g++.dg/cpp0x/initlist-array10.C | 14 ++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-array10.C
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 45c204e4269..6e614d5a058 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16772,7 +16772,6 @@ tsubst_copy (tree t, tree args, tsubst_flags_t
complain, tree in_decl)
case INTEGER_CST:
case REAL_CST:
- case STRING_CST:
case COMPLEX_CST:
{
/* Instantiate any typedefs in the type. */
@@ -16782,6 +16781,18 @@ tsubst_copy (tree t, tree args, tsubst_flags_t
complain, tree in_decl)
return r;
}
+ case STRING_CST:
+ {
+ tree type = tsubst (TREE_TYPE (t), args, complain, in_decl);
+ r = t;
+ if (type != TREE_TYPE (t))
+ {
+ r = copy_node (t);
+ TREE_TYPE (r) = type;
+ }
+ return r;
+ }
+
case PTRMEM_CST:
/* These can sometimes show up in a partial instantiation, but never
involve template parms. */
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array10.C
b/gcc/testsuite/g++.dg/cpp0x/initlist-array10.C
new file mode 100644
index 00000000000..fb9e136b56e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array10.C
@@ -0,0 +1,14 @@
+// PR c++/90966
+// { dg-do compile { target c++11 } }
+
+template<typename I>
+void f()
+{
+ using S = signed char;
+ constexpr const S v[]{0};
+}
+
+int main()
+{
+ f<int>();
+}
base-commit: 1f2e84238c9f079747804026b6225ec8c1d0e4b7
--
2.18.1
