aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/init.c11
-rw-r--r--gcc/testsuite/g++.dg/warn/Winit-list5.C61
2 files changed, 70 insertions, 2 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 1426f9a..771a19b 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -749,8 +749,15 @@ maybe_warn_list_ctor (tree member, tree init)
|| !is_list_ctor (current_function_decl))
return;
- tree parms = FUNCTION_FIRST_USER_PARMTYPE (current_function_decl);
- tree initlist = non_reference (TREE_VALUE (parms));
+ tree parm = FUNCTION_FIRST_USER_PARMTYPE (current_function_decl);
+ parm = TREE_VALUE (parm);
+ tree initlist = non_reference (parm);
+
+ /* Do not warn if the parameter is an lvalue reference to non-const. */
+ if (TYPE_REF_P (parm) && !TYPE_REF_IS_RVALUE (parm)
+ && !CP_TYPE_CONST_P (initlist))
+ return;
+
tree targs = CLASSTYPE_TI_ARGS (initlist);
tree elttype = TREE_VEC_ELT (targs, 0);
diff --git a/gcc/testsuite/g++.dg/warn/Winit-list5.C b/gcc/testsuite/g++.dg/warn/Winit-list5.C
new file mode 100644
index 0000000..07b3a69
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Winit-list5.C
@@ -0,0 +1,61 @@
+// PR c++/102482
+// { dg-do compile { target c++11 } }
+// Test we don't warn for non-const lvalue refs.
+
+#include <initializer_list>
+
+struct X { };
+
+struct span
+{
+ span(std::initializer_list<int>& il)
+ : begin(il.begin()) // { dg-bogus "initializer_list" }
+ { }
+
+ const int* begin;
+};
+
+struct span_warn
+{
+ span_warn(std::initializer_list<int> il)
+ : begin(il.begin()) // { dg-warning "initializer_list" }
+ { }
+
+ const int* begin;
+};
+
+struct span_warn2
+{
+ span_warn2(std::initializer_list<int>&& il)
+ : begin(il.begin()) // { dg-warning "initializer_list" }
+ { }
+
+ const int* begin;
+};
+
+struct span_warn3
+{
+ span_warn3(std::initializer_list<int> const& il)
+ : begin(il.begin()) // { dg-warning "initializer_list" }
+ { }
+
+ const int* begin;
+};
+
+struct span_warn4
+{
+ span_warn4(std::initializer_list<int> const il)
+ : begin(il.begin()) // { dg-warning "initializer_list" }
+ { }
+
+ const int* begin;
+};
+
+struct span_warn5
+{
+ span_warn5(std::initializer_list<int> const&& il)
+ : begin(il.begin()) // { dg-warning "initializer_list" }
+ { }
+
+ const int* begin;
+};