diff options
| author | Jason Merrill <jason@redhat.com> | 2017-04-17 15:24:31 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-04-17 15:24:31 -0400 |
| commit | 6864d849216e1a8ccc9d5e58b2b652ad28029a56 (patch) | |
| tree | 4b480d43304d9df16fe2ee4eb47bd08ebadfeea0 /gcc | |
| parent | 4e64ba0091fe74dc3835d7d13eab011113840ab6 (diff) | |
| download | gcc-6864d849216e1a8ccc9d5e58b2b652ad28029a56.zip gcc-6864d849216e1a8ccc9d5e58b2b652ad28029a56.tar.gz gcc-6864d849216e1a8ccc9d5e58b2b652ad28029a56.tar.bz2 | |
* pt.c (tsubst_init): Set TARGET_EXPR_DIRECT_INIT_P.
From-SVN: r246953
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic-init2.C | 20 |
3 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0aa6351..aa35f83 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2017-04-17 Jason Merrill <jason@redhat.com> + + * pt.c (tsubst_init): Set TARGET_EXPR_DIRECT_INIT_P. + 2017-04-15 Alexandre Oliva <aoliva@redhat.com> * decl.c (name_unnamed_type): Split out of... diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 862c2c2..f8436b3 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -14413,6 +14413,8 @@ tsubst_init (tree init, tree decl, tree args, complain); if (TREE_CODE (init) == AGGR_INIT_EXPR) init = get_target_expr_sfinae (init, complain); + if (TREE_CODE (init) == TARGET_EXPR) + TARGET_EXPR_DIRECT_INIT_P (init) = true; } return init; diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-init2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-init2.C new file mode 100644 index 0000000..8d5228c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-init2.C @@ -0,0 +1,20 @@ +// { dg-do compile { target c++11 } } + +struct MoveOnly { + MoveOnly() = default; + MoveOnly(MoveOnly const&) = delete; + MoveOnly(MoveOnly&&) = default; +}; + +struct StoresMoveOnly { + StoresMoveOnly() {} + ~StoresMoveOnly() = default; + + MoveOnly value; +}; + +template <class ...Args> void test(Args... args) { + StoresMoveOnly s(args...); +} + +int main() { test(); } |