From 9b79d5d3baad087f145d64ae7f132be0aac3b901 Mon Sep 17 00:00:00 2001 From: Nina Dinka Ranns Date: Wed, 5 Jun 2019 14:11:20 -0400 Subject: [PATCH] PR c++/63149 - wrong auto deduction from braced-init-list 2019-06-04 Nina Dinka Ranns gcc/cp/ * pt.c (listify_autos): Use non cv qualified auto_node in std::initializer_list. testsuite/ * g++.dg/cpp0x/initlist-deduce2.C: New test. From-SVN: r271968 --- gcc/cp/pt.c | 2 +- gcc/testsuite/g++.dg/cpp0x/initlist-deduce2.C | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-deduce2.C diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index cfbd9fd4c88..d2cf3458253 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -26836,7 +26836,7 @@ listify (tree arg) static tree listify_autos (tree type, tree auto_node) { - tree init_auto = listify (auto_node); + tree init_auto = listify (strip_top_quals (auto_node)); tree argvec = make_tree_vec (1); TREE_VEC_ELT (argvec, 0) = init_auto; if (processing_template_decl) diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-deduce2.C b/gcc/testsuite/g++.dg/cpp0x/initlist-deduce2.C new file mode 100644 index 00000000000..dbf68a40c85 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist-deduce2.C @@ -0,0 +1,8 @@ +// Test for PR63149 +// { dg-do compile { target c++11 } } + +#include + +const auto r = { 1, 2, 3 }; +using X = decltype(r); +using X = const std::initializer_list; -- 2.30.2