aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2013-02-12 15:47:15 -0500
committerJason Merrill <jason@gcc.gnu.org>2013-02-12 15:47:15 -0500
commitd8af1a555746ae398d3328813546ed17d418b857 (patch)
treef05abda8609ab1a622c223269ac2c8b5692d6b47
parent2ee028f1be282f8d72893a33412952069f83b7cc (diff)
downloadgcc-d8af1a555746ae398d3328813546ed17d418b857.zip
gcc-d8af1a555746ae398d3328813546ed17d418b857.tar.gz
gcc-d8af1a555746ae398d3328813546ed17d418b857.tar.bz2
re PR c++/56285 ([C++11] Arguments to an inheriting constructor are not forwarded properly)
PR c++/56285 * method.c (add_one_base_init): Handle base constructor taking rvalue reference parm. From-SVN: r195990
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/method.c3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/inh-ctor16.C15
3 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0d4d5cf..bc4e41c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
2013-02-12 Jason Merrill <jason@redhat.com>
+ PR c++/56285
+ * method.c (add_one_base_init): Handle base constructor
+ taking rvalue reference parm.
+
PR c++/56291
* semantics.c (sort_constexpr_mem_initializers): Handle
vptr out of order.
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index a1bab95..ff29b59 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -500,7 +500,8 @@ add_one_base_init (tree binfo, tree parm, bool move_p, tree inh,
for (; parm; parm = DECL_CHAIN (parm))
{
tree exp = convert_from_reference (parm);
- if (TREE_CODE (TREE_TYPE (parm)) != REFERENCE_TYPE)
+ if (TREE_CODE (TREE_TYPE (parm)) != REFERENCE_TYPE
+ || TYPE_REF_IS_RVALUE (TREE_TYPE (parm)))
exp = move (exp);
*p = build_tree_list (NULL_TREE, exp);
p = &TREE_CHAIN (*p);
diff --git a/gcc/testsuite/g++.dg/cpp0x/inh-ctor16.C b/gcc/testsuite/g++.dg/cpp0x/inh-ctor16.C
new file mode 100644
index 0000000..58e848b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/inh-ctor16.C
@@ -0,0 +1,15 @@
+// PR c++/56285
+// { dg-options -std=c++11 }
+
+struct foo {
+ explicit foo(int&&) {}
+};
+
+struct bar: private foo {
+ using foo::foo;
+};
+
+int main()
+{
+ bar b { 42 };
+}